Merge branch 'master' of ssh://git.openstreetmap.org/var/lib/git/dns
authorGrant Slater <openstreetmap@firefishy.com>
Tue, 17 Jan 2012 15:45:51 +0000 (15:45 +0000)
committerGrant Slater <openstreetmap@firefishy.com>
Tue, 17 Jan 2012 15:45:51 +0000 (15:45 +0000)
src/openstreetmap

index dfb54756614d9ec86856c821d01c243b49a385c0..92d5e972ac21769aecd4c6355b0b4c0dc0671b75 100644 (file)
 +help.openstreetmap:89.16.179.150
 +shop.openstreetmap:89.16.179.150
 +dns.openstreetmap:89.16.179.150
++osticket.openstreetmap:89.16.179.150
 +shenron.bm.openstreetmap:10.0.0.251
 
 3shenron.openstreetmap:200141c800100996021d7dfffec3df70
 3help.openstreetmap:200141c800100996021d7dfffec3df70
 3shop.openstreetmap:200141c800100996021d7dfffec3df70
 3dns.openstreetmap:200141c800100996021d7dfffec3df70
+3osticket.openstreetmap:200141c800100996021d7dfffec3df70
 
 # Wiki server
 
 
 # HOT site
 
-+hot.openstreetmap:69.163.129.108
++hot.openstreetmap:50.56.49.247
++humanitarian.openstreetmap:50.56.49.247
++hot-staging.openstreetmap:50.56.49.247
++hot-dev.openstreetmap:50.56.49.247
 
 # Jochen Topf's taginfo service, running on openstreetmap.de hardware