projects / mirror / dsa-nagios.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0869d48 f7167e7)
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
authorMartin Zobel-Helas <zobel@debian.org>
Thu, 9 Feb 2017 11:45:52 +0000 (12:45 +0100)
committerMartin Zobel-Helas <zobel@debian.org>
Thu, 9 Feb 2017 11:45:52 +0000 (12:45 +0100)
* 'master' of git+ssh://db.debian.org/git/dsa-nagios:
  sallinen fan#1 and fan#2 are absent
  porta and kaufmann get their rsync via systemd
  retry_check_interval is deprecated.  Replace with retry_interval.
  no more xinetd on kaufmann
  add sallinen

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.