Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
authorMartin Zobel-Helas <zobel@debian.org>
Sat, 7 Jan 2012 11:41:30 +0000 (12:41 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Sat, 7 Jan 2012 11:41:30 +0000 (12:41 +0100)
* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  Now the armhs seem to be like everyone else Signed-off-by: Stephen Gran <steve@lobefin.net>
  new monit check for armhf/sid machines

1  2 
config/nagios-master.cfg

Simple merge