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)
* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  puppet.conf: increase the connect timeout a bit


Trivial merge