]> 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: b686644 acebf76)
Merge "Fix DHCP agent to work with latest dnsmasq"
authorJenkins <jenkins@review.openstack.org>
Wed, 24 Jul 2013 19:41:08 +0000 (19:41 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 24 Jul 2013 19:41:08 +0000 (19:41 +0000)
1  2 
neutron/agent/linux/dhcp.py patch | diff1 | diff2 | blob | history
neutron/tests/unit/test_linux_dhcp.py patch | diff1 | diff2 | blob | history

diff --cc neutron/agent/linux/dhcp.py
Simple merge
diff --cc neutron/tests/unit/test_linux_dhcp.py
Simple merge