From: Martin Zobel-Helas <zobel@debian.org>
Date: Mon, 2 Jan 2012 15:31:14 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=a10fb1454d3edce97d11a2587acc459941b82cd8;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:
  dsa-check-log-age-loghost: allow minus (-) in hostnames
  no more pg9 on stabile
  danzi has xinetd
  Add new-master
  snapshot file limits
  blavet now has xinetd
  the BSD hosts all have a /srv
  smtp check for zappa
  Add zappa
  filesystem shuffle on stabile
  Add blavet
  checks should work better with the right ip
---

a10fb1454d3edce97d11a2587acc459941b82cd8