Merge "Enable heat-manage purge_deleted cron job"
authorJenkins <jenkins@review.openstack.org>
Tue, 1 Mar 2016 18:03:35 +0000 (18:03 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 1 Mar 2016 18:03:35 +0000 (18:03 +0000)
1  2 
puppet/controller.yaml
puppet/hieradata/controller.yaml
puppet/manifests/overcloud_controller.pp
puppet/manifests/overcloud_controller_pacemaker.pp

Simple merge
Simple merge