From: Martin Zobel-Helas Date: Sun, 19 Mar 2017 12:47:02 +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=7078770bf6bf50fecb8dac96388fbecaa93a8e9f;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: Fix bacula-dir.conf template Drop dead bits in ftp_upload Fix portforwarder inetd config for new puppet --- 7078770bf6bf50fecb8dac96388fbecaa93a8e9f