Merge remote-tracking branch 'waldi/rsync-systemd-master'
authorPeter Palfrader <peter@palfrader.org>
Fri, 10 Feb 2017 20:41:07 +0000 (21:41 +0100)
committerPeter Palfrader <peter@palfrader.org>
Fri, 10 Feb 2017 20:41:07 +0000 (21:41 +0100)
commit1ab297e177f78afa9ae4ff44ba3110fbec30beee
treed93a165670a571a29f28178c5c3ab709397f8c7a
parent352faf50b6166b87fc6e7e6e723d266f8ad6f5ab
parent32c346e6fc2d7a7a78e95f63011a9e6cefc75637
Merge remote-tracking branch 'waldi/rsync-systemd-master'

* waldi/rsync-systemd-master:
  Use rsyncd via system on security_master
  Use rsyncd via systemd on ftp_master
  Use rsyncd via systemd on archive_master