Merge "Leverage on Xtesting"

author valentin boucher <valentin.boucher@kontron.com>

Fri, 2 Mar 2018 18:37:54 +0000 (18:37 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Fri, 2 Mar 2018 18:37:54 +0000 (18:37 +0000)
author valentin boucher <valentin.boucher@kontron.com>
Fri, 2 Mar 2018 18:37:54 +0000 (18:37 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Fri, 2 Mar 2018 18:37:54 +0000 (18:37 +0000)
diff --cc docker/features/testcases.yaml
Simple merge
diff --cc functest/ci/testcases.yaml
Simple merge
author	valentin boucher <valentin.boucher@kontron.com>
	Fri, 2 Mar 2018 18:37:54 +0000 (18:37 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Fri, 2 Mar 2018 18:37:54 +0000 (18:37 +0000)
		1	2
docker/features/testcases.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
functest/ci/testcases.yaml	patch \|	diff1 \|	diff2 \|	blob \| history