Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Fri, 25 Jun 2010 11:15:56 +0000 (13:15 +0200)
committerPeter Palfrader <peter@palfrader.org>
Fri, 25 Jun 2010 11:15:56 +0000 (13:15 +0200)
commit3d648bc054363ac6ee8d958208c4d05df7486a26
treea5fc514118d366007494675a100d0520ff15c687
parent948a5caece3bf3788b5b1622569d4cba54d11d1c
parentc82b94323487edf7ff8b6c64a578b77724d46cfd
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios

* 'master' of ssh://db.debian.org/git/dsa-nagios:
  disable checking rsync, http ftp on kassia-sec
  kaufmann does iptables, thus ulogd
config/nagios-master.cfg