Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 47f4414 2a64b67)
Merge "neutron: remove tenant MTU configuration options"
authorJenkins <jenkins@review.openstack.org>
Mon, 11 Jul 2016 18:03:28 +0000 (18:03 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 11 Jul 2016 18:03:29 +0000 (18:03 +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