]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
projects / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c14d0a7 85f3b07)
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Sun, 21 Feb 2010 15:57:20 +0000 (16:57 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sun, 21 Feb 2010 15:57:20 +0000 (16:57 +0100)
* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  nagios is also allowed to connect to ssh
  anchor start of line
  template the munin master as well
  erb, I hate you
  reshuffle bind configuration


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.