Merge "Delete fipnamespace when external net removed on DVR"

author Jenkins <jenkins@review.openstack.org>

Wed, 4 Nov 2015 20:57:42 +0000 (20:57 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 4 Nov 2015 20:57:42 +0000 (20:57 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 4 Nov 2015 20:57:42 +0000 (20:57 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 4 Nov 2015 20:57:42 +0000 (20:57 +0000)
diff --cc neutron/agent/l3/agent.py
Simple merge
diff --cc neutron/db/l3_dvr_db.py
Simple merge
diff --cc neutron/tests/functional/agent/test_l3_agent.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 4 Nov 2015 20:57:42 +0000 (20:57 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 4 Nov 2015 20:57:42 +0000 (20:57 +0000)
		1	2
neutron/agent/l3/agent.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/db/l3_dvr_db.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/functional/agent/test_l3_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history