Merge "Allows customization of the HAProxy default timeouts"
authorJenkins <jenkins@review.openstack.org>
Thu, 17 Dec 2015 10:20:03 +0000 (10:20 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 17 Dec 2015 10:20:03 +0000 (10:20 +0000)
1  2 
manifests/loadbalancer.pp

Simple merge