Merge "Add a gate-specific tox env for functional tests"

author Jenkins <jenkins@review.openstack.org>

Sat, 19 Jul 2014 02:48:16 +0000 (02:48 +0000)

committer Gerrit Code Review <review@openstack.org>

Sat, 19 Jul 2014 02:48:16 +0000 (02:48 +0000)
author Jenkins <jenkins@review.openstack.org>
Sat, 19 Jul 2014 02:48:16 +0000 (02:48 +0000)
committer Gerrit Code Review <review@openstack.org>
Sat, 19 Jul 2014 02:48:16 +0000 (02:48 +0000)
diff --cc TESTING.rst
Simple merge
diff --cc tox.ini
Simple merge
author	Jenkins <jenkins@review.openstack.org>
	Sat, 19 Jul 2014 02:48:16 +0000 (02:48 +0000)
committer	Gerrit Code Review <review@openstack.org>
	Sat, 19 Jul 2014 02:48:16 +0000 (02:48 +0000)
		1	2
TESTING.rst	patch \|	diff1 \|	diff2 \|	blob \| history
tox.ini	patch \|	diff1 \|	diff2 \|	blob \| history