Merge "Revert "Removed test_lib module""

author Jenkins <jenkins@review.openstack.org>

Mon, 29 Jun 2015 23:02:30 +0000 (23:02 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 29 Jun 2015 23:02:30 +0000 (23:02 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 29 Jun 2015 23:02:30 +0000 (23:02 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 29 Jun 2015 23:02:30 +0000 (23:02 +0000)
diff --cc neutron/tests/unit/db/test_db_base_plugin_v2.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 29 Jun 2015 23:02:30 +0000 (23:02 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 29 Jun 2015 23:02:30 +0000 (23:02 +0000)