From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 7 Feb 2017 20:41:49 +0000 (+0100)
Subject: Merge remote-tracking branch 'waldi/keyring-ssl'
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;ds=sidebyside;h=1e21bed9a8238b5bf8e9f348993614ee5dc60a0d;hp=1e21bed9a8238b5bf8e9f348993614ee5dc60a0d;p=mirror%2Fdsa-puppet.git

Merge remote-tracking branch 'waldi/keyring-ssl'

* waldi/keyring-ssl:
  Enable rsync-ssl on keyring.debian.org

Conflicts:
	modules/roles/manifests/keyring.pp
---