Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 582c150 cd5ba32)
Merge "Remove unused EnablePacemaker param from templates"
authorJenkins <jenkins@review.openstack.org>
Wed, 17 Jun 2015 18:36:42 +0000 (18:36 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 17 Jun 2015 18:36:42 +0000 (18:36 +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