Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  geo1 on squeeze
  unger on squeeze
  rietz on squeeze

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 953f706230f176881b0db64ee09756adbf3add2c..672b4d8fcc683c2345451ef165aef4dc4fad860d 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -383,6 +383,7 @@ host_settings:
     - heininen.debian.org
     - englund.debian.org
     - rautavaara.debian.org
+    - salieri.debian.org
 #  reservedaddrs:
 #    ball.debian.org: "0.0.0.0/8 : 127.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5"
 ---