Merge "Conditionally expose haproxy endpoints"
authorJenkins <jenkins@review.openstack.org>
Tue, 30 Aug 2016 09:42:20 +0000 (09:42 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 30 Aug 2016 09:42:20 +0000 (09:42 +0000)

Trivial merge