Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Tue, 15 Sep 2009 21:33:32 +0000 (23:33 +0200)
committerPeter Palfrader <peter@palfrader.org>
Tue, 15 Sep 2009 21:33:32 +0000 (23:33 +0200)
commitb6fc0c89bbc899e4eda38b983e2b56a42d63e92d
tree9fc2bf23063a9452667f40452bf54ed2bcbca7b2
parentfc7ae1ae02a26529fe12f33f68a91438db91060a
parent56589c6e34866a00ca46204716c641cd6ef75f2d
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  reverse zone on slaves
  another blacklist entry
  blacklist *@piekmarketing.eu for spam