projects / mirror / dsa-nagios.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b531aa7 de40ba1)
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Mon, 18 Jan 2010 12:08:06 +0000 (13:08 +0100)
committerPeter Palfrader <peter@palfrader.org>
Mon, 18 Jan 2010 12:08:06 +0000 (13:08 +0100)
* 'master' of ssh://db.debian.org/git/dsa-nagios:
  they seem to have acpid
  grnet beginnings

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.