From: Peter Palfrader Date: Sun, 21 Feb 2010 15:57:20 +0000 (+0100) Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4470a04f2686b69c3d10776c24ef2ff56f83982d;p=dsa-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 connect to ssh anchor start of line template the munin master as well erb, I hate you reshuffle bind configuration --- 4470a04f2686b69c3d10776c24ef2ff56f83982d