Merge "Remove double callback manager mocks"

author Jenkins <jenkins@review.openstack.org>

Fri, 26 Jun 2015 08:12:34 +0000 (08:12 +0000)

committer Gerrit Code Review <review@openstack.org>

Fri, 26 Jun 2015 08:12:34 +0000 (08:12 +0000)
author Jenkins <jenkins@review.openstack.org>
Fri, 26 Jun 2015 08:12:34 +0000 (08:12 +0000)
committer Gerrit Code Review <review@openstack.org>
Fri, 26 Jun 2015 08:12:34 +0000 (08:12 +0000)
diff --cc neutron/tests/unit/agent/l3/test_agent.py
Simple merge
diff --cc neutron/tests/unit/agent/l3/test_dvr_local_router.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Fri, 26 Jun 2015 08:12:34 +0000 (08:12 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Fri, 26 Jun 2015 08:12:34 +0000 (08:12 +0000)
		1	2
neutron/tests/unit/agent/l3/test_agent.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/agent/l3/test_dvr_local_router.py	patch \|	diff1 \|	diff2 \|	blob \| history