X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=d8734a046c71427c3e302e73b4b2e1ba03402521;hb=097f6102749a6363bb1946c251033ea35a6de3a8;hp=da9ee116efde13a7110e0b42c258146935c51310;hpb=26eba52e377609b4c983726012dd31cfe7dd30b2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index da9ee116e..d8734a046 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -62,7 +62,6 @@ nameinfo:
   mayer.debian.org: John Mayer (October 28th, 1930 - March 9th, 2004)
   mayr.debian.org: Johann(es) Simon Mayr (June 14th, 1763 - December 2nd, 1845)
   merikanto.debian.org: Oskar Merikanto (August 5th, 1868 - February 17th, 1924)
-  merkel.debian.org: Gustav (Adolf) Merkel (November 12th, 1827 - October 30th, 1885)
   merulo.debian.org: Claudio Merulo (April 8th, 1533 - May 4th, 1604)
   morricone.debian.org: Ennio Morricone (November 10th, 1928 - )
   mundy.debian.org: William Mundy (c. 1529 - 1591)
@@ -142,7 +141,6 @@ services:
   packagesmaster: powell.debian.org
   packagesqamaster: master.debian.org
   puppetmaster: handel.debian.org
-  qamaster: merkel.debian.org
   rtmaster: 
     - reger.debian.org
 host_settings:
@@ -157,7 +155,6 @@ host_settings:
     - kokkonen.debian.org
     - master.debian.org
     - merikanto.debian.org
-    - merkel.debian.org
     - morricone.debian.org
     - nono.debian.org
     - powell.debian.org
@@ -236,8 +233,12 @@ host_settings:
     - zandonai.debian.org
     - zee.debian.org
   squeeze:
+    - abel.debian.org
+    - agricola.debian.org
     - alain.debian.org
     - alkman.debian.org
+    - alwyn.debian.org
+    - arcadelt.debian.org
     - arne.debian.org
     - ball.debian.org
     - barber.debian.org