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)
commite9db05646d1629417ea356987ff8bfa04a7f2ab0
tree18cd15adac4c7d0b659a6b4181570921ee8b46f4
parent710fe899d8cbfb00fbca4cd5c450c102a0d21f5e
parent0a80116e261531e9af5e9043161af219a627d20c
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

* '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
config/nagios-master.cfg