Merge "Config flavor metadata via functest - docs update"

author Cedric Ollivier <cedric.ollivier@orange.com>

Mon, 18 Jun 2018 08:00:55 +0000 (08:00 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Mon, 18 Jun 2018 08:00:55 +0000 (08:00 +0000)
author Cedric Ollivier <cedric.ollivier@orange.com>
Mon, 18 Jun 2018 08:00:55 +0000 (08:00 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Mon, 18 Jun 2018 08:00:55 +0000 (08:00 +0000)
diff --cc docs/testing/user/userguide/runfunctest.rst
Simple merge
diff --cc docs/testing/user/userguide/test_details.rst
Simple merge
author	Cedric Ollivier <cedric.ollivier@orange.com>
	Mon, 18 Jun 2018 08:00:55 +0000 (08:00 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Mon, 18 Jun 2018 08:00:55 +0000 (08:00 +0000)
		1	2
docs/testing/user/userguide/runfunctest.rst	patch \|	diff1 \|	diff2 \|	blob \| history
docs/testing/user/userguide/test_details.rst	patch \|	diff1 \|	diff2 \|	blob \| history