From: Martin Zobel-Helas Date: Fri, 4 Feb 2011 16:25:31 +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=b22631bbcb3adc2f8bb05b05e3414456cdb68f01;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: Remove redundant entry Set BatchMode to yes for portforwarder's ssh. This also implies ServerAliveInterval set to 300 --- b22631bbcb3adc2f8bb05b05e3414456cdb68f01