Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Wed, 26 Apr 2017 12:57:43 +0000 (14:57 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Wed, 26 Apr 2017 12:57:43 +0000 (14:57 +0200)
commit3628350798e85b25012ebd69eebdaf93b7d43556
tree5aa2b4be18456f57dc9ea1f93f730742a439ab7b
parentfb2d1f4e62bf2f3382ffd0584a9872b92a86572f
parent4bac4d66f9f48e24ee82b8d62117e65fa68d7bdb
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:
  samhain: ignore /etc/schroot/setup.d/99builddsourceslist
  setup-dchroot: fix SUITE_ARCH detection for jessie kfreebsd chroots
  99porterbox-extra-sources: use jessie-kfreebsd as base for jessie-backports kfreebsd chroots
  99builddsourceslist: add a hack to handle the kfreebsd jessie-backport case
  Always set permissions of apache2 log directory
  Fix previous commit
  Drop outgoing IPv4 multicast traffic at AQL