projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b370640 d32e60a)
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)
* '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?


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