Merge "Increase haproxy client/server timeout for swift-proxy"
authorJenkins <jenkins@review.openstack.org>
Sat, 22 Oct 2016 21:45:27 +0000 (21:45 +0000)
committerGerrit Code Review <review@openstack.org>
Sat, 22 Oct 2016 21:45:27 +0000 (21:45 +0000)
1  2 
manifests/haproxy.pp

Simple merge