From: Grant Slater <openstreetmap@firefishy.com>
Date: Tue, 17 Jan 2012 15:45:51 +0000 (+0000)
Subject: Merge branch 'master' of ssh://git.openstreetmap.org/var/lib/git/dns
X-Git-Url: https://git.openstreetmap.org/dns.git/commitdiff_plain/68891ca43bab909d0ef184fb8d3854d451da66b2?hp=9d0eb6122d00782812ec7d4f0926007f5ac5c6ec

Merge branch 'master' of ssh://git.openstreetmap.org/var/lib/git/dns
---

diff --git a/src/openstreetmap b/src/openstreetmap
index dfb5475..92d5e97 100644
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -213,6 +213,7 @@
 +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
@@ -224,6 +225,7 @@
 3help.openstreetmap:200141c800100996021d7dfffec3df70
 3shop.openstreetmap:200141c800100996021d7dfffec3df70
 3dns.openstreetmap:200141c800100996021d7dfffec3df70
+3osticket.openstreetmap:200141c800100996021d7dfffec3df70
 
 # Wiki server
 
@@ -257,7 +259,10 @@
 
 # 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