projects / mirror / dsa-nagios.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7fee83b 7616169)
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Fri, 7 May 2010 08:50:20 +0000 (10:50 +0200)
committerPeter Palfrader <peter@palfrader.org>
Fri, 7 May 2010 08:50:20 +0000 (10:50 +0200)
* 'master' of ssh://db.debian.org/git/dsa-nagios:
  na, there is now acpid running on mundy
  syslog-ng in squeeze needs two process, for some reason
  Disable NFS for dsa_disk_usage_all

1  2 
config/nagios-master.cfg patch | diff1 | diff2 | blob | history

diff --cc config/nagios-master.cfg
Simple merge
Unnamed repository; edit this file 'description' to name the repository.