Merge "Default haproxy listeners activation on hiera service _enabled"
authorJenkins <jenkins@review.openstack.org>
Thu, 1 Sep 2016 10:51:01 +0000 (10:51 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 1 Sep 2016 10:51:01 +0000 (10:51 +0000)

Trivial merge