X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmisc%2Flocal.yaml;h=008ffd39ae20869a92218afefe8837ba41560ce3;hb=d46e15fc9edead0044eb283fc6c5d57fc383bda3;hp=811c6a6195117c5cc5f3737044063b1f35612457;hpb=a11112154a88ffd029f98da65c51d6c096929615;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 811c6a619..008ffd39a 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -58,11 +58,11 @@ nameinfo:
   menotti.debian.org: Gian Carlo Menotti (July 7th, 1911 - February 1st, 2007)
   manziarly.debian.org: Marcelle de Manziarly (October 1st/13th, 1899 -  May 12th, 1989)
   mekeel.debian.org: Joyce Mekeel (July 6th, 1931 - Dec 29th, 1997)
-  merulo.debian.org: Claudio Merulo (April 8th, 1533 - May 4th, 1604)
   milanollo.debian.org: Teresa Milanollo (August 28th, 1827 - October 25th, 1904)
   minkus.debian.org: Ludwig Minkus (March 23rd 1826 - December 7th, 1917)
   muffat.debian.org: George Muffat (June 1st, 1653 - February 23rd, 1704)
   nono.debian.org: Luigi Nono (January 29th, 1924 - May 8th, 1990)
+  olin.debian.org: Elisabeth Olin (December 1740 - March 26th, 1828)
   oyens.debian.org: Tera de Marez Oyens (August 5th, 1932 - August 29th, 1996)
   paradis.debian.org: Maria Theresia Paradis (May 15th, 1759 - February 1st, 1824)
   partch.debian.org: Harry Partch (June 24th, 1901 - September 3rd, 1974)
@@ -168,7 +168,6 @@ host_settings:
     - falla.debian.org
     - fischer.debian.org
     - harris.debian.org
-    - merulo.debian.org
     - minkus.debian.org
     - partch.debian.org
     - pizzetti.debian.org
@@ -185,7 +184,6 @@ host_settings:
     - arm-linaro-03.debian.org
     - arnold.debian.org
     - babin.debian.org
-    - caballero.debian.org
     - eberlin.debian.org
     - fano.debian.org
     - fayrfax.debian.org
@@ -195,18 +193,19 @@ host_settings:
     - hasse.debian.org
     - henze.debian.org
     - hoiby.debian.org
-    - lucatelli.debian.org
     - mips-aql-01.debian.org
     - mips-aql-02.debian.org
     - mips-aql-04.debian.org
     - mips-aql-05.debian.org
     - mips-aql-06.debian.org
     - mips-sil-01.debian.org
+    - mips-manda-01.debian.org
     - mipsel-aql-01.debian.org
     - mipsel-aql-02.debian.org
     - mipsel-aql-03.debian.org
     - mipsel-manda-01.debian.org
     - mipsel-manda-02.debian.org
+    - mipsel-manda-03.debian.org
     - mipsel-sil-01.debian.org
     - porpora.debian.org
     - poulenc.debian.org
@@ -236,14 +235,15 @@ host_settings:
     - hasse.debian.org
     - henze.debian.org
     - hoiby.debian.org
-    - lucatelli.debian.org
     - mips-aql-01.debian.org
     - mips-aql-02.debian.org
     - mips-aql-04.debian.org
     - mips-aql-05.debian.org
     - mips-aql-06.debian.org
+    - mips-manda-01.debian.org
     - mips-sil-01.debian.org
     - mipsel-aql-03.debian.org
+    - mipsel-manda-03.debian.org
     - mipsel-sil-01.debian.org
     - sompek.debian.org
   mail_port: