Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 3e8010d ea1294f)
Merge "Pacemaker maintenance mode for the duration of Puppet run on update"
authorJenkins <jenkins@review.openstack.org>
Tue, 15 Dec 2015 13:26:50 +0000 (13:26 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 15 Dec 2015 13:26:50 +0000 (13:26 +0000)
1  2 
overcloud.yaml patch | diff1 | diff2 | blob | history
puppet/all-nodes-config.yaml patch | diff1 | diff2 | blob | history

diff --cc overcloud.yaml
Simple merge
diff --cc puppet/all-nodes-config.yaml
Simple merge