Merge "Tighten exception handler for import_object"

author Jenkins <jenkins@review.openstack.org>

Wed, 15 Jul 2015 08:41:58 +0000 (08:41 +0000)

committer Gerrit Code Review <review@openstack.org>

Wed, 15 Jul 2015 08:41:58 +0000 (08:41 +0000)
author Jenkins <jenkins@review.openstack.org>
Wed, 15 Jul 2015 08:41:58 +0000 (08:41 +0000)
committer Gerrit Code Review <review@openstack.org>
Wed, 15 Jul 2015 08:41:58 +0000 (08:41 +0000)
diff --cc neutron/tests/unit/agent/l3/test_agent.py
Simple merge
diff --cc tox.ini
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Wed, 15 Jul 2015 08:41:58 +0000 (08:41 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Wed, 15 Jul 2015 08:41:58 +0000 (08:41 +0000)
		1	2
neutron/tests/unit/agent/l3/test_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history
tox.ini	patch \|	diff1 \|	diff2 \|	blob \| history