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