Merge "Fix DVR to service DHCP Ports"

author Jenkins <jenkins@review.openstack.org>

Tue, 16 Sep 2014 13:26:05 +0000 (13:26 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 16 Sep 2014 13:26:05 +0000 (13:26 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 16 Sep 2014 13:26:05 +0000 (13:26 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 16 Sep 2014 13:26:05 +0000 (13:26 +0000)
diff --cc neutron/common/utils.py
Simple merge
diff --cc neutron/tests/unit/test_common_utils.py
Simple merge
diff --cc neutron/tests/unit/test_l3_schedulers.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 16 Sep 2014 13:26:05 +0000 (13:26 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 16 Sep 2014 13:26:05 +0000 (13:26 +0000)
		1	2
neutron/common/utils.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/test_common_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/test_l3_schedulers.py	patch \|	diff1 \|	diff2 \|	blob \| history