Merge "Replace per role manifests with a common role manifest"
authorJenkins <jenkins@review.openstack.org>
Fri, 30 Sep 2016 17:44:22 +0000 (17:44 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 30 Sep 2016 17:44:22 +0000 (17:44 +0000)

Trivial merge