projects / mirror / dsa-puppet.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3e4e094 0449ed5)
Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Thu, 9 May 2013 19:23:52 +0000 (21:23 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Thu, 9 May 2013 19:23:52 +0000 (21:23 +0200)
commit1a2b96081cd2d9f1492630b1ebb60331e7db5a06
tree48fe7edd9e1c5ed7e1815f464fc628530f72ed85tree | snapshot
parent3e4e0946835e0ca9b9167b38ac17949754a0f120commit | diff
parent0449ed5f8035e9fe95ebbaaa9972fe45edca4c71commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.