Merge "Replace occurences of 'test_tenant' with 'test-tenant' in tests"

author Jenkins <jenkins@review.openstack.org>

Mon, 30 Jun 2014 20:31:21 +0000 (20:31 +0000)

committer Gerrit Code Review <review@openstack.org>

Mon, 30 Jun 2014 20:31:21 +0000 (20:31 +0000)
author Jenkins <jenkins@review.openstack.org>
Mon, 30 Jun 2014 20:31:21 +0000 (20:31 +0000)
committer Gerrit Code Review <review@openstack.org>
Mon, 30 Jun 2014 20:31:21 +0000 (20:31 +0000)
diff --cc neutron/tests/unit/db/metering/test_db_metering.py
Simple merge
diff --cc neutron/tests/unit/test_extension_security_group.py
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Mon, 30 Jun 2014 20:31:21 +0000 (20:31 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Mon, 30 Jun 2014 20:31:21 +0000 (20:31 +0000)
		1	2
neutron/tests/unit/db/metering/test_db_metering.py	patch \|	diff1 \|	diff2 \|	blob \| history
neutron/tests/unit/test_extension_security_group.py	patch \|	diff1 \|	diff2 \|	blob \| history