From: Martin Zobel-Helas <zobel@debian.org>
Date: Sat, 12 Nov 2011 16:36:43 +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;h=c755ce7dd7baf8218f517d87e1f09ca2a1fd4b9f;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:
  rsyncd-hosts updates
  Let's monitor rsync on rsyncd-hosts
  wolkenstein on squeeze
  klecker is down for now
  add jenkins
  local build of samhain is working, I think
  We need to look for two locations, not two directives
  Fix a bashism
  test with == is a bashism
  last 2, and get IPs right
  add armhf hosts
  eder has a /srv
  add eder, eysler
  Get rid of gw-telefonica
  remove locke and lamb, take 2
  remove locke and lamb

Conflicts:
	config/nagios-master.cfg
---

c755ce7dd7baf8218f517d87e1f09ca2a1fd4b9f