]> 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: b3bf5ee 3101e2b)
Merge "Move dhcp_lease_duration into DHCP agent config options list"
authorJenkins <jenkins@review.openstack.org>
Fri, 13 Nov 2015 22:31:42 +0000 (22:31 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 13 Nov 2015 22:31:42 +0000 (22:31 +0000)
1  2 
etc/neutron.conf patch | diff1 | diff2 | blob | history
neutron/common/config.py patch | diff1 | diff2 | blob | history

diff --cc etc/neutron.conf
Simple merge
diff --cc neutron/common/config.py
Simple merge