Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 758eeff 21d2afd)
Merge "neutron: don't set external_network_bridge option by default"
authorJenkins <jenkins@review.openstack.org>
Thu, 23 Feb 2017 00:06:28 +0000 (00:06 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 23 Feb 2017 00:06:28 +0000 (00:06 +0000)
1  2 
environments/network-environment.yaml patch | diff1 | diff2 | blob | history
puppet/services/neutron-l3-compute-dvr.yaml patch | diff1 | diff2 | blob | history
puppet/services/neutron-l3.yaml patch | diff1 | diff2 | blob | history

diff --cc environments/network-environment.yaml
Simple merge
diff --cc puppet/services/neutron-l3.yaml
Simple merge