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)
commit1479fe164bed206f53f9fb5662f0ff7fe43bf37e
tree2b12a197f28c1c4ab4ca133ee39041e2e74468fd
parent0f9b84d3f46ab4707130f373a06394ae9a193ad4
parent9a929bda3d601706dc9f96291d00995502e8a4d8
Merge remote-tracking branch 'waldi/managed-rsyncd-syncproxy'

* waldi/managed-rsyncd-syncproxy:
  Use archvsync managed secrets files for rsyncd on syncproxy