From: Peter Palfrader Date: Sun, 21 Feb 2010 18:53:28 +0000 (+0100) Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b364b3d560b1fed02b36a33190f1fd0e9a02932a;p=mirror%2Fdsa-puppet.git 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? --- b364b3d560b1fed02b36a33190f1fd0e9a02932a