From: Martin Zobel-Helas <zobel@debian.org>
Date: Thu, 1 Feb 2018 18:07:08 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://git2.debian.org/dsa/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=40676ab4e5a91665f557f34f944bae430f9b4eb0;hp=-c;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of git+ssh://git2.debian.org/dsa/dsa-puppet
---

40676ab4e5a91665f557f34f944bae430f9b4eb0
diff --combined modules/debian_org/files/misc/local.yaml
index a6018258a,b3395d7a5..b03a0b747
--- a/modules/debian_org/files/misc/local.yaml
+++ b/modules/debian_org/files/misc/local.yaml
@@@ -11,6 -11,7 +11,6 @@@ nameinfo
    bendel.debian.org: Franz Bendel (March 23rd, 1833 - July 3rd, 1874)
    binet.debian.org: Jocelyne Binet (September 27th, 1923 - January 13th, 1968)
    boott.debian.org: Francis Boott (June 24th, 1813 - March 1st, 1904)
 -  busoni.debian.org: Ferruccio Dante Michelangiolo Benvenuto Busoni (April 1st, 1866 - July 27th, 1924)
    buxtehude.debian.org: Dieterich Buxtehude (c. 1637 to 1639 - May 9th, 1707)
    byrd.debian.org: William Byrd (1543 - July 4th, 1623)
    casulana.debian.org: Maddalena Casulana (c. 1544 - c. 1590)
@@@ -230,7 -231,6 +230,6 @@@ host_settings
    entropy_key:
      - czerny.debian.org
      - grnet-node01.debian.org
-     # - ubc-bl2.debian.org
      - storace.debian.org
    buildd_master:
      - wuiet.debian.org