Merge "Remove deprecated namespace deletion options"

author Jenkins <jenkins@review.openstack.org>

Fri, 23 Oct 2015 15:45:28 +0000 (15:45 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 23 Oct 2015 15:45:28 +0000 (15:45 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 23 Oct 2015 15:45:28 +0000 (15:45 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 23 Oct 2015 15:45:28 +0000 (15:45 +0000)
diff --cc neutron/tests/unit/agent/l3/test_dvr_fip_ns.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 23 Oct 2015 15:45:28 +0000 (15:45 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 23 Oct 2015 15:45:28 +0000 (15:45 +0000)