projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
17ee2b2
7f18f21
)
Merge remote-tracking branch 'waldi/keyring-ssl'
author
Peter Palfrader
<peter@palfrader.org>
Tue, 7 Feb 2017 20:41:49 +0000
(21:41 +0100)
committer
Peter Palfrader
<peter@palfrader.org>
Tue, 7 Feb 2017 20:41:49 +0000
(21:41 +0100)
* waldi/keyring-ssl:
Enable rsync-ssl on keyring.debian.org
Conflicts:
modules/roles/manifests/keyring.pp
Trivial merge
projects / mirror / dsa-puppet.git / commitdiff