From: Martin Zobel-Helas <zobel@debian.org>
Date: Wed, 8 Feb 2017 15:14:43 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4612e4d0e37493f79becfa45caf9adcd657ed7ca;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  add sallinen
  Enable authentication for buildd-keyrings rsync module
  Use archvsync managed secrets files for rsyncd on syncproxy
  Cannot depend on Package[xinetd] without it being defined
  only pull in xinetd if we do not try to remove files
  Enable rsync-ssl on keyring.debian.org
  Unify rsyncd module comments
  Extract default rsyncd module parameter
  De-list all rsync shares on ftp/ports/security-master
  Enable rsync-ssl on keyring.debian.org
  setup-all-dchroots: use the 2017 key for debian-ports
---

4612e4d0e37493f79becfa45caf9adcd657ed7ca