Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Sun, 23 May 2010 12:55:02 +0000 (14:55 +0200)
committerPeter Palfrader <peter@palfrader.org>
Sun, 23 May 2010 12:55:02 +0000 (14:55 +0200)
commitb4a2207497cf87fd5b342859c28d86ef41130ac6
tree4a2a55f90852a431f9a0a35ad858e3d75920bc15
parentf779c1c3c6e51ed994abf4cda8e1f4a0d0a1f92e
parent621c3caee3801e01a63b62dbcfbe214f8c85514e
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  Update changelog
  A postgres WAL backup check
  Revert "na, there is now acpid running on mundy"
  bring changelog back into touch with deployed version, and add changelog entry for previous commit
  dsa-update-apt-status: it's not an error to exit when we don't need to run
  prep release
config/nagios-master.cfg