projects / mirror / dsa-nagios.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit16fb381d3738840dd136f9d171f22cb188c71f0d
treec0dd8d5041833b3c83ac219403111e9f0fbdef09tree | snapshot
parent0869d483664edf2a353760e559f981f98dca6ca6commit | diff
parentf7167e7c56afd55cef645076864e0f77cc618e6fcommit | diff
Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios

* '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
config/nagios-master.cfg diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.