From: Martin Zobel-Helas Date: Thu, 17 Feb 2011 13:49:52 +0000 (+0100) Subject: Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa... X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1e2215e901a25f879a2e6f23e3d5035fd0cf3423;p=mirror%2Fdsa-puppet.git Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet * 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet: ries no ftphost, put morricone into it (has backports). also allow archvsync runmirrors on SECHOSTS for dak openafs does not work on samosa --- 1e2215e901a25f879a2e6f23e3d5035fd0cf3423