Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: b096c32 f7826b8)
Merge "Perform basic setup of Pacemaker cluster using puppet-pacemaker"
authorJenkins <jenkins@review.openstack.org>
Tue, 21 Apr 2015 10:57:51 +0000 (10:57 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 21 Apr 2015 10:57:51 +0000 (10:57 +0000)
1  2 
puppet/controller-puppet.yaml patch | diff1 | diff2 | blob | history
puppet/hieradata/controller.yaml patch | diff1 | diff2 | blob | history
puppet/manifests/overcloud_controller.pp patch | diff1 | diff2 | blob | history

diff --cc puppet/controller-puppet.yaml
Simple merge
diff --cc puppet/hieradata/controller.yaml
Simple merge