From: Martin Zobel-Helas <zobel@debian.org>
Date: Thu, 9 May 2013 19:23:52 +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=1a2b96081cd2d9f1492630b1ebb60331e7db5a06;hp=--cc;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:
  Kill christoph IP addresses per request
  Add pejacevic dedication
  Dist nsswitch.conf from puppet
  Add wwids for pejacevic and -srv
  Try to find config harder
  Produce different schroot config files depending on distro
  Make schroot scripts work on wheezy
  Only source /etc/schroot/default/config if it exists
---

1a2b96081cd2d9f1492630b1ebb60331e7db5a06