projects / mirror / dsa-nagios.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit7bd27044a66c8949ff390f910e7b7dbb8b097f68
treee657d4f1de767cc8499afbbe558e62d7d8c18dedtree | snapshot
parent7fee83b8a40b27d04fe45bbf73edfc56b27de246commit | diff
parent7616169e43da74432af172eb42eb3cbd7e230ef2commit | diff
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* '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
config/nagios-master.cfg diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.