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

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet: (29 commits)
  ordering hint
  add sonntag
  Add buxtehude
  Add buxtehude
  Add a fi
  Try this
  More output
  Try this
  Try to do network right at osuosl
  end
  Try to make dsa.conf.erb a useful template
  ganeti module on byrd
  Add quotes
  Only do the ferm stuff for cluster ganeti2.d.o
  Fix spacing
  Say which ganeti cluster we are in
  Add byrd
  remove vivaldi (RT#3802)
  widor is getting hammered
  mode is important
  ...

diff --cc modules/debian-org/misc/local.yaml
index 6aab03914ce39402e8965098c89c4d8ea2cc2b95,d8b5f2eda576134b59981ac622be5c21ce028239..557430de44c37929545d604a8ea0eb29b714d55b
--- 1/modules/debian-org/misc/local.yaml
--- 2/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@@ -132,9 -136,7 +136,8 @@@ nameinfo
    tye.debian.org: Christopher Tye (c.1505 - 1573)
    ullmann.debian.org: Viktor Ullmann (January 1st, 1898 - October 17th, 1944)
    unger.debian.org: Caroline Unger (October 28th, 1803 - March 23th, 1877)
 +  vento.debian.org: Ivo de Vento (1543/1545 - 1575)
    vitry.debian.org: Philippe de Vitry (October 31st, 1291 - June 9th, 1361)
-   vivaldi.debian.org: Antonio Lucio Vivaldi (March 4th, 1678 - July 28th, 1741)
    widor.debian.org: Charles-Marie Jean Albert Widor (February 21st, 1844 - March 12th, 1937)
    wieck.debian.org: Clara Josephine Wieck (September 13th, 1819 - May 20th, 1896)
    wolkenstein.debian.org: Oswald von Wolkenstein (1377 - August 2nd, 1445)

diff --cc modules/exim/templates/virtualdomains.erb
Simple merge