projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ca2318 26671bd)
Merge remote-tracking branch 'waldi/managed-rsyncd-security-master'
authorPeter Palfrader <peter@palfrader.org>
Tue, 10 Jan 2017 20:08:37 +0000 (21:08 +0100)
committerPeter Palfrader <peter@palfrader.org>
Tue, 10 Jan 2017 20:08:37 +0000 (21:08 +0100)
* waldi/managed-rsyncd-security-master:
  Use archvsync managed secrets files for rsyncd on security-master
  Drop dead exports rsync module from security-master


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