projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f9b84d 9a929bd)
Merge remote-tracking branch 'waldi/managed-rsyncd-syncproxy'
authorPeter Palfrader <peter@palfrader.org>
Tue, 7 Feb 2017 21:13:11 +0000 (22:13 +0100)
committerPeter Palfrader <peter@palfrader.org>
Tue, 7 Feb 2017 21:13:11 +0000 (22:13 +0100)
* waldi/managed-rsyncd-syncproxy:
  Use archvsync managed secrets files for rsyncd on syncproxy


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.