]> git.donarmstrong.com Git - dsa-puppet.git/commit
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Tue, 10 Nov 2009 11:10:17 +0000 (12:10 +0100)
committerPeter Palfrader <peter@palfrader.org>
Tue, 10 Nov 2009 11:10:17 +0000 (12:10 +0100)
commitd04337a5dcdf53f5805e7828c398252c1b8389da
tree71aaebca55b2347ae4097980cea25ede8acc417c
parent40a4d654bb99a5ecf1628fad9d0b3e1c0b2f4408
parentda2b5ed6cbe135cc1c3dd6cfbceaf11e6be80e0e
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:
  um, the point of splitting out reservedaddrs was for ball.  Explicitly giving it the default list is probably not useful
  klecker no longer handles security.d.o mail
  this is a wierd one, but grep for the patten on powell
modules/debian-org/misc/local.yaml