projects / mirror / dsa-nagios.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6187efd b4e7871)
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Wed, 17 Feb 2010 09:11:10 +0000 (10:11 +0100)
committerPeter Palfrader <peter@palfrader.org>
Wed, 17 Feb 2010 09:11:10 +0000 (10:11 +0100)
* 'master' of ssh://db.debian.org/git/dsa-nagios:
  monit check for squeeze
  Hostgroup dialup is no longer needed
  Catch empty hostgroups during build
  Move ball and purcell to man-da hosts
  ball moved ip, add purcell

1  2 
config/nagios-master.cfg patch | diff1 | diff2 | blob | history

diff --cc config/nagios-master.cfg
Simple merge
Unnamed repository; edit this file 'description' to name the repository.