]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
projects / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 40a4d65 da2b5ed)
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)
* '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

1  2 
modules/debian-org/misc/local.yaml patch | diff1 | diff2 | blob | history

diff --cc modules/debian-org/misc/local.yaml
Simple merge
Unnamed repository; edit this file 'description' to name the repository.