Merge "Generating test lists for tempest"

author Morgan Richomme <morgan.richomme@orange.com>

Mon, 18 Apr 2016 15:53:57 +0000 (15:53 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Mon, 18 Apr 2016 15:53:57 +0000 (15:53 +0000)
author Morgan Richomme <morgan.richomme@orange.com>
Mon, 18 Apr 2016 15:53:57 +0000 (15:53 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Mon, 18 Apr 2016 15:53:57 +0000 (15:53 +0000)
diff --cc docker/run_tests.sh
Simple merge
diff --cc testcases/config_functest.yaml
Simple merge
author	Morgan Richomme <morgan.richomme@orange.com>
	Mon, 18 Apr 2016 15:53:57 +0000 (15:53 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Mon, 18 Apr 2016 15:53:57 +0000 (15:53 +0000)
		1	2
docker/run_tests.sh	patch \|	diff1 \|	diff2 \|	blob \| history
testcases/config_functest.yaml	patch \|	diff1 \|	diff2 \|	blob \| history