projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a03afdf c71e5dd)
Merge remote-tracking branch 'waldi/managed-rsyncd-ftp-master'
authorPeter Palfrader <peter@palfrader.org>
Tue, 10 Jan 2017 20:49:24 +0000 (21:49 +0100)
committerPeter Palfrader <peter@palfrader.org>
Tue, 10 Jan 2017 20:49:24 +0000 (21:49 +0100)
* waldi/managed-rsyncd-ftp-master:
  Use archvsync managed secrets files for rsyncd on ftp-master


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