Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 9a1c402 1f7426a)
Merge "Set EnablePacemaker == false be default"
authorJenkins <jenkins@review.openstack.org>
Wed, 22 Apr 2015 20:05:51 +0000 (20:05 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 22 Apr 2015 20:05:51 +0000 (20:05 +0000)
1  2 
controller.yaml patch | diff1 | diff2 | blob | history
overcloud-without-mergepy.yaml patch | diff1 | diff2 | blob | history
puppet/controller-puppet.yaml patch | diff1 | diff2 | blob | history

diff --cc controller.yaml
Simple merge
diff --cc overcloud-without-mergepy.yaml
Simple merge
diff --cc puppet/controller-puppet.yaml
Simple merge