projects / mirror / dsa-nagios.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b00a651 22e9882)
Merge branch 'master' of ssh://db.debian.org/git/dsa-nagios
authorPeter Palfrader <peter@palfrader.org>
Sat, 27 Mar 2010 15:25:25 +0000 (16:25 +0100)
committerPeter Palfrader <peter@palfrader.org>
Sat, 27 Mar 2010 15:25:25 +0000 (16:25 +0100)
* 'master' of ssh://db.debian.org/git/dsa-nagios:
  grieg has postgres
  corelli has ulogd
  add corelli

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.