Merge "Create config_functest patch to update the conf with scenario"

author boucherv <valentin.boucher@orange.com>

Thu, 11 Aug 2016 09:06:09 +0000 (09:06 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Thu, 11 Aug 2016 09:06:09 +0000 (09:06 +0000)
author boucherv <valentin.boucher@orange.com>
Thu, 11 Aug 2016 09:06:09 +0000 (09:06 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Thu, 11 Aug 2016 09:06:09 +0000 (09:06 +0000)
diff --cc docker/Dockerfile
Simple merge
diff --cc testcases/OpenStack/tempest/run_tempest.py
Simple merge
author	boucherv <valentin.boucher@orange.com>
	Thu, 11 Aug 2016 09:06:09 +0000 (09:06 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Thu, 11 Aug 2016 09:06:09 +0000 (09:06 +0000)
		1	2
docker/Dockerfile	patch \|	diff1 \|	diff2 \|	blob \| history
testcases/OpenStack/tempest/run_tempest.py	patch \|	diff1 \|	diff2 \|	blob \| history