projects / mirror / dsa-nagios.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da44ea1 78f00d6)
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Fri, 5 Mar 2010 15:32:11 +0000 (16:32 +0100)
committerPeter Palfrader <peter@palfrader.org>
Fri, 5 Mar 2010 15:32:11 +0000 (16:32 +0100)
* 'master' of ssh://db.debian.org/git/dsa-nagios:
  I don't think gw-cst has the same ip as escher

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.