From: Martin Zobel-Helas Date: Sun, 25 Jun 2017 11:09:56 +0000 (+0200) 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/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=4f14632836804e153148f2be6fa081e815cb12ce 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: puppet.conf: increase the connect timeout a bit --- 4f14632836804e153148f2be6fa081e815cb12ce