Merge "Default route missing for IPv6 subnets in HA Router"

author Jenkins <jenkins@review.openstack.org>

Tue, 24 Feb 2015 17:20:39 +0000 (17:20 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 24 Feb 2015 17:20:39 +0000 (17:20 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 24 Feb 2015 17:20:39 +0000 (17:20 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 24 Feb 2015 17:20:39 +0000 (17:20 +0000)
diff --cc neutron/agent/l3/ha_router.py
Simple merge
diff --cc neutron/tests/functional/agent/test_l3_agent.py
Simple merge
diff --cc neutron/tests/unit/test_l3_agent.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 24 Feb 2015 17:20:39 +0000 (17:20 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 24 Feb 2015 17:20:39 +0000 (17:20 +0000)
		1	2
neutron/agent/l3/ha_router.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/functional/agent/test_l3_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/test_l3_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history