Merge "Fix barbican server name to not use aodh hiera"
authorJenkins <jenkins@review.openstack.org>
Mon, 14 Nov 2016 09:36:37 +0000 (09:36 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 14 Nov 2016 09:36:37 +0000 (09:36 +0000)
1  2 
manifests/haproxy.pp

Simple merge