From: Martin Zobel-Helas <zobel@debian.org>
Date: Thu, 27 Jan 2011 08:56:56 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=829d64b47c297462e237f218f7c05d0401f0e25e;p=mirror%2Fdsa-nagios.git

Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  englund has apache now
  and xinetd on sibelius
  Make the check work with Ubuntu's kernel names (Alexander Reichle-Schmehl)
  (c) years
  Fix --ignore-transfer-speed logic
  Group ../debian/changelog better
  sibelius is now an rsyncd host
  Do not do cpqarrayd checks on squeeze
  Do not require the set of excludes to be a subset of the included hosts
  Do apt checks on squeeze now
  update hostgroups for raff
  Change disk usage thresholds for /vicepa from 80/90 to 90/95
---

829d64b47c297462e237f218f7c05d0401f0e25e