Merge "Prevent haproxy to run iptables during docker-puppet configuration"
authorJenkins <jenkins@review.openstack.org>
Mon, 31 Jul 2017 15:26:19 +0000 (15:26 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 31 Jul 2017 15:26:19 +0000 (15:26 +0000)
1  2 
manifests/haproxy.pp

Simple merge