]> 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>
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)
commit4470a04f2686b69c3d10776c24ef2ff56f83982d
treedfcfd53ba56015a3883f6d36b1b34df8c7bc9d89
parentc14d0a7356dc1222c88e9a7d4f4112c057f0c79f
parent85f3b078006d193a473c62f2b29e6b510eab8eed
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:
  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