From: Martin Zobel-Helas <zobel@debian.org>
Date: Sat, 10 Sep 2011 17:22:26 +0000 (+0200)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=57b225fc5eb497c88bf8c781e50d4914ff4d721e;p=mirror%2Fdsa-puppet.git

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

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  sudo for emdebian
  vivaldi → squeeze
  Try something with logrotate on wieck
  82.195.75.81 no longer works as nameserver

Conflicts:
	modules/debian-org/misc/local.yaml
---

57b225fc5eb497c88bf8c781e50d4914ff4d721e
diff --cc modules/debian-org/misc/local.yaml
index 52c277397,5b72b196f..1c557c5b5
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@@ -338,6 -340,8 +338,7 @@@ host_settings
      - unger.debian.org
      - villa.debian.org
      - vitry.debian.org
+     - vivaldi.debian.org
 -    - voltaire.debian.org
      - widor.debian.org
      - wieck.debian.org
      - zandonai.debian.org