Merge "Wire in HAProxy stats user and password"
authorJenkins <jenkins@review.openstack.org>
Mon, 21 Mar 2016 16:58:05 +0000 (16:58 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 21 Mar 2016 16:58:05 +0000 (16:58 +0000)
1  2 
puppet/controller.yaml

Simple merge