Merge "Static routes not added to qrouter namespace for DVR"

author Jenkins <jenkins@review.openstack.org>

Fri, 15 Jan 2016 01:24:20 +0000 (01:24 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 15 Jan 2016 01:24:21 +0000 (01:24 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 15 Jan 2016 01:24:20 +0000 (01:24 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 15 Jan 2016 01:24:21 +0000 (01:24 +0000)
diff --cc neutron/agent/l3/router_info.py
Simple merge
diff --cc neutron/tests/functional/agent/l3/framework.py
Simple merge
diff --cc neutron/tests/unit/agent/l3/test_agent.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 15 Jan 2016 01:24:20 +0000 (01:24 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 15 Jan 2016 01:24:21 +0000 (01:24 +0000)
		1	2
neutron/agent/l3/router_info.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/functional/agent/l3/framework.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/agent/l3/test_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history