caballero → squeeze

[dsa-puppet.git] / modules / debian-org / misc / local.yaml

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 744598c4d2182199a8dd62cf9f3aaba0535972a4..6aa29e12c89d02bc5d053c5e1b3b5c7817cc2291 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -38,6 +38,7 @@ nameinfo:
   gabrielli.debian.org: Domenico Gabrielli (April 15th, 1651 - July 10th, 1690)
   glinka.debian.org: Mikhail Ivanovich Glinka (1804 - 1857)
   gluck.debian.org: Christoph Willibald Ritter von Gluck (July 2nd, 1714 - November 15th, 1787)
+  gombert.debian.org: Nicolas Gombert (c. 1495 – c. 1560)
   dukas.debian.org: Paul Dukas (1865 - 1935)
   goedel.debian.org: Kurt Gödel (April 28th, 1906 - January 14th, 1978)
   goetz.debian.org: Hermann Gustav Goetz (December 7th, 1840 - December 3rd, 1876)
@@ -61,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)
@@ -141,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:
@@ -156,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
@@ -235,9 +233,15 @@ host_settings:
     - zandonai.debian.org
     - zee.debian.org
   squeeze:
+    - abel.debian.org
+    - agricola.debian.org
     - alain.debian.org
     - alkman.debian.org
+    - alwyn.debian.org
+    - antheil.debian.org
+    - arcadelt.debian.org
     - arne.debian.org
+    - arnold.debian.org
     - ball.debian.org
     - barber.debian.org
     - beethoven.debian.org
@@ -247,6 +251,7 @@ host_settings:
     - brahms.debian.org
     - busoni.debian.org
     - byrd.debian.org
+    - caballero.debian.org
     - chopin.debian.org
     - cilea.debian.org
     - danzi.debian.org
@@ -267,6 +272,7 @@ host_settings:
     - geo3.debian.org
     - glinka.debian.org
     - gluck.debian.org
+    - gombert.debian.org
     - grieg.debian.org
     - handel.debian.org
     - heininen.debian.org
@@ -381,6 +387,7 @@ host_settings:
     gluck.debian.org: mailout.debian.org
     goedel.debian.org: mailout.debian.org
     goetz.debian.org: mailout.debian.org
+    gombert.debian.org: mailout.debian.org
     handel.debian.org: mailout.debian.org
     heininen.debian.org: mailout.debian.org
     holter.debian.org: mailout.debian.org