From: Peter Palfrader Date: Fri, 7 May 2010 08:50:20 +0000 (+0200) Subject: Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=7bd27044a66c8949ff390f910e7b7dbb8b097f68;p=mirror%2Fdsa-nagios.git 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 --- 7bd27044a66c8949ff390f910e7b7dbb8b097f68