projects / mirror / dsa-nagios.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 948a5ca c82b943)
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)
* 'master' of ssh://db.debian.org/git/dsa-nagios:
  disable checking rsync, http ftp on kassia-sec
  kaufmann does iptables, thus ulogd

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.