Merge pull request #90 from khandieyea/more-deployable

Add ignores/dirty so the branch stays clean/_more_ pullable in prod
This commit is contained in:
Robert Chacón 2022-09-13 06:11:16 -06:00 committed by GitHub
commit 64ab240b15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 12 deletions

15
.gitignore vendored Normal file
View File

@ -0,0 +1,15 @@
v1.1/Shaper.csv
v1.1/network.json
v1.1/ispConfig.py
v1.1/xdp-cpumap-tc/
v1.1/pping
v1.1/statsByDevice.json
v1.1/statsByParentNode.json
v1.1/*.bak
# Ignore project folders for some IDEs
.idea/
__pycache__

4
.gitmodules vendored
View File

@ -1,12 +1,16 @@
[submodule "v0.9/xdp-cpumap-tc"] [submodule "v0.9/xdp-cpumap-tc"]
path = v0.9/xdp-cpumap-tc path = v0.9/xdp-cpumap-tc
url = https://github.com/xdp-project/xdp-cpumap-tc.git url = https://github.com/xdp-project/xdp-cpumap-tc.git
ignore = dirty
[submodule "v1.0/xdp-cpumap-tc"] [submodule "v1.0/xdp-cpumap-tc"]
path = v1.0/xdp-cpumap-tc path = v1.0/xdp-cpumap-tc
url = https://github.com/xdp-project/xdp-cpumap-tc.git url = https://github.com/xdp-project/xdp-cpumap-tc.git
ignore = dirty
[submodule "v1.1/xdp-cpumap-tc"] [submodule "v1.1/xdp-cpumap-tc"]
path = v1.1/xdp-cpumap-tc path = v1.1/xdp-cpumap-tc
url = https://github.com/xdp-project/xdp-cpumap-tc.git url = https://github.com/xdp-project/xdp-cpumap-tc.git
ignore = dirty
[submodule "v1.2/xdp-cpumap-tc"] [submodule "v1.2/xdp-cpumap-tc"]
path = v1.2/xdp-cpumap-tc path = v1.2/xdp-cpumap-tc
url = https://github.com/xdp-project/xdp-cpumap-tc.git url = https://github.com/xdp-project/xdp-cpumap-tc.git
ignore = dirty

View File

@ -1,12 +1,12 @@
ID,AP,MAC,Hostname,IPv4,IPv6,Download Min,Upload Min,Download Max,Upload Max ID,AP,MAC,Hostname,IPv4,IPv6,Download Min,Upload Min,Download Max,Upload Max
,AP_A,,Device 1,100.64.0.1,,25,5,155,20 ,AP_A,,Device 1,100.64.0.1,,25,5,155,20
,AP_A,,Device 2,100.64.0.2,,25,5,105,18 ,AP_A,,Device 2,100.64.0.2,,25,5,105,18
,AP_9,,Device 3,100.64.0.3,,25,5,105,18 ,AP_9,,Device 3,100.64.0.3,,25,5,105,18
,AP_9,,Device 4,100.64.0.4,,25,5,105,18 ,AP_9,,Device 4,100.64.0.4,,25,5,105,18
,AP_11,,Device 5,100.64.0.5,,25,5,105,18 ,AP_11,,Device 5,100.64.0.5,,25,5,105,18
,AP_11,,Device 6,100.64.0.6,,25,5,90,15 ,AP_11,,Device 6,100.64.0.6,,25,5,90,15
,AP_1,,Device 7,100.64.0.7,,25,5,155,20 ,AP_1,,Device 7,100.64.0.7,,25,5,155,20
,AP_1,,Device 8,100.64.0.8,,25,5,105,18 ,AP_1,,Device 8,100.64.0.8,,25,5,105,18
,AP_7,,Device 9,100.64.0.9,,25,5,105,18 ,AP_7,,Device 9,100.64.0.9,,25,5,105,18
,AP_7,,Device 10,100.64.0.10,,25,5,105,18 ,AP_7,,Device 10,100.64.0.10,,25,5,105,18
,Site_1,,Device 11,100.64.0.11,,25,5,105,18 ,Site_1,,Device 11,100.64.0.11,,25,5,105,18
1 ID AP MAC Hostname IPv4 IPv6 Download Min Upload Min Download Max Upload Max
2 AP_A Device 1 100.64.0.1 25 5 155 20
3 AP_A Device 2 100.64.0.2 25 5 105 18
4 AP_9 Device 3 100.64.0.3 25 5 105 18
5 AP_9 Device 4 100.64.0.4 25 5 105 18
6 AP_11 Device 5 100.64.0.5 25 5 105 18
7 AP_11 Device 6 100.64.0.6 25 5 90 15
8 AP_1 Device 7 100.64.0.7 25 5 155 20
9 AP_1 Device 8 100.64.0.8 25 5 105 18
10 AP_7 Device 9 100.64.0.9 25 5 105 18
11 AP_7 Device 10 100.64.0.10 25 5 105 18
12 Site_1 Device 11 100.64.0.11 25 5 105 18