Merge "Simplify retargetable test framework"

author Jenkins <jenkins@review.openstack.org>

Tue, 31 Mar 2015 23:00:33 +0000 (23:00 +0000)

committer Gerrit Code Review <review@openstack.org>

Tue, 31 Mar 2015 23:00:33 +0000 (23:00 +0000)
author Jenkins <jenkins@review.openstack.org>
Tue, 31 Mar 2015 23:00:33 +0000 (23:00 +0000)
committer Gerrit Code Review <review@openstack.org>
Tue, 31 Mar 2015 23:00:33 +0000 (23:00 +0000)
diff --cc neutron/tests/unit/ml2/test_ml2_plugin.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Tue, 31 Mar 2015 23:00:33 +0000 (23:00 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Tue, 31 Mar 2015 23:00:33 +0000 (23:00 +0000)