Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 4e293c2 444d3ba)
Merge "Making nova parameters configurable for nuage-metadata-agent"
authorJenkins <jenkins@review.openstack.org>
Mon, 7 Dec 2015 20:39:12 +0000 (20:39 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 7 Dec 2015 20:39:12 +0000 (20:39 +0000)
1  2 
overcloud.yaml patch | diff1 | diff2 | blob | history
puppet/compute.yaml patch | diff1 | diff2 | blob | history
puppet/controller.yaml patch | diff1 | diff2 | blob | history

diff --cc overcloud.yaml
Simple merge
diff --cc puppet/compute.yaml
Simple merge
diff --cc puppet/controller.yaml
Simple merge