Merge "Fixes Multiple External Networks issue with DVR"

author Jenkins <jenkins@review.openstack.org>

Sat, 7 Feb 2015 00:24:14 +0000 (00:24 +0000)

committer Gerrit Code Review <review@openstack.org>

Sat, 7 Feb 2015 00:24:14 +0000 (00:24 +0000)
author Jenkins <jenkins@review.openstack.org>
Sat, 7 Feb 2015 00:24:14 +0000 (00:24 +0000)
committer Gerrit Code Review <review@openstack.org>
Sat, 7 Feb 2015 00:24:14 +0000 (00:24 +0000)
diff --cc neutron/db/l3_dvrscheduler_db.py
Simple merge
diff --cc neutron/scheduler/l3_agent_scheduler.py
Simple merge
diff --cc neutron/tests/unit/test_l3_schedulers.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Sat, 7 Feb 2015 00:24:14 +0000 (00:24 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Sat, 7 Feb 2015 00:24:14 +0000 (00:24 +0000)
		1	2
neutron/db/l3_dvrscheduler_db.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/scheduler/l3_agent_scheduler.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/test_l3_schedulers.py	patch \|	diff1 \|	diff2 \|	blob \| history