Merge remote-tracking branch 'waldi/keyring-ssl'
authorPeter Palfrader <peter@palfrader.org>
Tue, 7 Feb 2017 20:41:49 +0000 (21:41 +0100)
committerPeter Palfrader <peter@palfrader.org>
Tue, 7 Feb 2017 20:41:49 +0000 (21:41 +0100)
commit1e21bed9a8238b5bf8e9f348993614ee5dc60a0d
tree474b868d8f3cd8e83987e37f84421b5571ab6828
parent17ee2b26f9eb4a03b48db6aef26894e042736c5f
parent7f18f21c8a9d538bac4a1ae874b492a80f432623
Merge remote-tracking branch 'waldi/keyring-ssl'

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

Conflicts:
modules/roles/manifests/keyring.pp