]> git.donarmstrong.com Git - dsa-puppet.git/commit
Merge remote branch 'ganneff/master'
authorPeter Palfrader <peter@palfrader.org>
Thu, 17 Feb 2011 10:11:12 +0000 (11:11 +0100)
committerPeter Palfrader <peter@palfrader.org>
Thu, 17 Feb 2011 10:11:12 +0000 (11:11 +0100)
commit7738e92cf3b448a3ec4a185ab0593a3341ad1fe8
tree13ba8eadba3525db9b3fe8add9f21e097e417d32
parentdaf71c686cb928fd45a6fc30aba4e602154e0217
parentbe0dcbc5394aa4dfe3b8302818429412f1104d8b
Merge remote branch 'ganneff/master'

* ganneff/master:
  ries no ftphost, put morricone into it (has backports). also allow archvsync runmirrors on SECHOSTS for dak

Signed-off-by: Peter Palfrader <peter@palfrader.org>