Merge "Remove deleted Cinder rows"
authorJenkins <jenkins@review.openstack.org>
Thu, 7 Jan 2016 17:23:10 +0000 (17:23 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 7 Jan 2016 17:23:10 +0000 (17:23 +0000)
commit27cfda59e46f0614f91e13e907065511a00dab03
treeab4bd7d350681caa8bb88c29507b162b73fb2fd6
parent1e157766e4430aed80526056ede19d22c03ee5f3
parent81b056f1c8027b2cde9da6d6577430407eb28404
Merge "Remove deleted Cinder rows"
puppet/controller.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp