]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Code Review / openstack-build / neutron-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: e119564 4d2cb85)
Merge "Use oslo_config new type PortOpt for port options"
authorJenkins <jenkins@review.openstack.org>
Mon, 2 Nov 2015 07:07:44 +0000 (07:07 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 2 Nov 2015 07:07:44 +0000 (07:07 +0000)
1  2 
neutron/agent/l3/config.py patch | diff1 | diff2 | blob | history
neutron/common/config.py patch | diff1 | diff2 | blob | history

diff --cc neutron/agent/l3/config.py
Simple merge
diff --cc neutron/common/config.py
Simple merge