Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
020-wireless
020_dns
Commits
94d1929f
Commit
94d1929f
authored
Sep 08, 2016
by
hark
Browse files
Merge branch 'master' of 185.52.224.4:020-wireless/020_dns
Conflicts: dns/hostfiles/routers
parents
4f5d52d7
0c048375
Changes
3
Hide whitespace changes
Inline
Side-by-side
dns/hostfiles/amsw_tunnel
View file @
94d1929f
...
...
@@ -14,4 +14,5 @@
10.205.252.8 tristor
10.205.252.9 kalium
10.205.252.10 atc
10.205.252.11 lurch
10.205.252.11 binney
10.205.252.12 stravinsky
dns/hostfiles/routers
View file @
94d1929f
...
...
@@ -10,7 +10,7 @@
10.205.253.7 nieuwlandrouter
10.205.253.8 tristor
10.205.253.9 kalium
10.205.253.10 wfc-afr
10.205.253.11 lurch
10.205.253.12 itineris
10.205.253.13 hemelvaart
10.205.253.10 beckers
10.205.253.11 binney
10.205.253.12 stravinsky
dns/hostfiles/transfernet
View file @
94d1929f
...
...
@@ -86,8 +86,8 @@
10.205.255.58 acta_wfc-stanleyh
10.205.255.59 acta_wfc-radio-acta
10.205.255.60 acta_wfc-radio-wfc
10.205.255.61 acta_wfc-router-wfc
afr #A Fashionable Router
10.205.255.62
acta_wfc-switch-wfc
10.205.255.61 acta_wfc-router-wfc
10.205.255.62
nothing
10.205.255.63 acta_wfc-broadcast
# GWL -> De Wittenkade
...
...
@@ -100,17 +100,3 @@
10.205.255.69 nothing
10.205.255.70 nothing
10.205.255.71 gwl_wittenkade-broadcast
# 10.205.255.248/29 allocated for /31 point-to-point links
# 10.205.255.248/31
10.205.255.248 lurch_itineris-lurch
10.205.255.249 lurch_itineris-itineris
# 10.205.255.250/31
10.205.255.250 nothing
10.205.255.251 nothing
# 10.205.255.252/31
10.205.255.252 nothing
10.205.255.253 nothing
# 10.205.255.254/31
10.205.255.254 nothing
10.205.255.255 nothing
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment