Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...
authorMartin Zobel-Helas <zobel@debian.org>
Thu, 13 Apr 2017 00:05:03 +0000 (02:05 +0200)
committerMartin Zobel-Helas <zobel@debian.org>
Thu, 13 Apr 2017 00:05:03 +0000 (02:05 +0200)
commit43939a76d75549c7e0ed0432250f47a4a4ddb108
treec854b81a519c1a10f6710b4990bad71af8176e9c
parent5eab2b6faa77326b59c1888ff9e2ef6855aeb49f
parentfa53570b0ec2707aaa7f1e16bc94ce5e3d607332
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:
  Use list of binds in apache config for syncproxies