From: Martin Zobel-Helas <zobel@debian.org>
Date: Thu, 9 Feb 2017 11:45:52 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://db.debian.org/git/dsa-nagios
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=16fb381d3738840dd136f9d171f22cb188c71f0d;p=mirror%2Fdsa-nagios.git

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
---

16fb381d3738840dd136f9d171f22cb188c71f0d