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

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 1425ae26853a9add0d82baa684ee147c5bae1690..fd0be861075af3de75581b389dd684718931cb94 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -76,10 +76,12 @@ nameinfo:
   widor.debian.org: Charles-Marie Jean Albert Widor (February 21, 1844 - March 12, 1937)
   wieck.debian.org: Clara Josephine Wieck (September 13, 1819 - May 20, 1896)
   wolkenstein.debian.org: Oswald von Wolkenstein (1377 - August 2nd, 1445)
+  zandonai.debian.org: Riccardo Zandonai (May 30th, 1883 - June 5th, 1944)
   zelenka.debian.org: Jan Dismas Zelenka (16 October 1679 - 23 December 1745)
 footer:
   lebrun.debian.org: "- This host is using an iptables firewall.  See /etc/rc.boot/firewall{,6}"
   schroeder.debian.org: "- This host is using an iptables firewall.  See /etc/rc.boot/firewall{,6}"
+  zandonai.debian.org: "Debian s390 buildd system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
   zelenka.debian.org: "Debian s390 porter system kindly provided by Zentrum fuer Informationsverarbeitung und Informationstechnik [zivit]"
 services:
   bugsmaster:
@@ -219,6 +221,7 @@ host_settings:
     wieck.debian.org: mailout.debian.org
     wolkenstein.debian.org: mailout.debian.org
     zee.debian.org: mailout.debian.org
+    zandonai.debian.org: mailout.debian.org
     zelenka.debian.org: mailout.debian.org
   mail_port:
     ancina.debian.org: 2025