From: Martin Zobel-Helas Date: Tue, 5 Jan 2010 15:12:21 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org... X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=09f53cc3299c6699be7959e6aff131d0034d97f8 Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- 09f53cc3299c6699be7959e6aff131d0034d97f8 diff --cc modules/debian-org/misc/local.yaml index 307735e07,1425ae268..fd0be8610 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@@ -76,17 -76,15 +76,17 @@@ 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: - bartok.debian.org: "Documentation: gluck:/org/admin.debian.org/doc/backup.debian.org" 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: rietz.debian.org + bugsmaster: + - busoni.debian.org + - rietz.debian.org bugsmx: - byrd.debian.org mailrelay: @@@ -232,10 -214,11 +216,12 @@@ host_settings steffani.debian.org: mailout.debian.org unger.debian.org: mailout.debian.org villa.debian.org: mailout.debian.org + vivaldi.debian.org: mailout.debian.org voltaire.debian.org: mailout.debian.org 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