Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Sun, 25 Jun 2017 11:09:56 +0000 (13:09 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Sun, 25 Jun 2017 11:09:56 +0000 (13:09 +0200)
commit4f14632836804e153148f2be6fa081e815cb12ce
treea02412723af673ab93fd6a8dc33ff5a16a8827b0
parent57ff971603fd14d7f511f090ae32bef85effbc16
parent96300e499bc8a09c714e73d5293479e3c9968ec4
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