Merge "Composable Horizon service - puppet-tripleo"
authorJenkins <jenkins@review.openstack.org>
Tue, 12 Jul 2016 11:56:55 +0000 (11:56 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 12 Jul 2016 11:56:55 +0000 (11:56 +0000)

Trivial merge