Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: ddf66ed 0b31299)
Merge "Enable predictable IPs on non-controllers"
authorJenkins <jenkins@review.openstack.org>
Thu, 10 Mar 2016 21:51:14 +0000 (21:51 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 10 Mar 2016 21:51:14 +0000 (21:51 +0000)
1  2 
overcloud.yaml patch | diff1 | diff2 | blob | history
puppet/cinder-storage.yaml patch | diff1 | diff2 | blob | history
puppet/compute.yaml patch | diff1 | diff2 | blob | history

diff --cc overcloud.yaml
Simple merge
diff --cc puppet/cinder-storage.yaml
Simple merge
diff --cc puppet/compute.yaml
Simple merge