Merge "Add Redis as a Pacemaker resource"
authorJenkins <jenkins@review.openstack.org>
Tue, 9 Jun 2015 07:15:33 +0000 (07:15 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 9 Jun 2015 07:15:33 +0000 (07:15 +0000)
1  2 
controller.yaml
overcloud-without-mergepy.yaml
puppet/controller-puppet.yaml
puppet/manifests/overcloud_controller_pacemaker.pp

diff --cc controller.yaml
Simple merge
Simple merge
Simple merge