]> 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 18:53:28 +0000 (19:53 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sun, 21 Feb 2010 18:53:28 +0000 (19:53 +0100)
commitb364b3d560b1fed02b36a33190f1fd0e9a02932a
treed1983cef2be3f6d678e32a98253b7818890bb7fa
parentb370640204b8fe55068c69d88fdf410d86f67b7a
parentd32e60a1ea92152c0d878634be27a1319fce2e71
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 check if munin is listening
  typo
  will ferm do the right thing?
  Revert "will ferm do the right thing?"
  will ferm do the right thing?