Merge "Add interface to run sfc functests."

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

Tue, 5 Jul 2016 08:33:25 +0000 (08:33 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Tue, 5 Jul 2016 08:33:25 +0000 (08:33 +0000)
author Morgan Richomme <morgan.richomme@orange.com>
Tue, 5 Jul 2016 08:33:25 +0000 (08:33 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Tue, 5 Jul 2016 08:33:25 +0000 (08:33 +0000)
diff --cc ci/config_functest.yaml
Simple merge
diff --cc docker/Dockerfile
Simple merge
author	Morgan Richomme <morgan.richomme@orange.com>
	Tue, 5 Jul 2016 08:33:25 +0000 (08:33 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Tue, 5 Jul 2016 08:33:25 +0000 (08:33 +0000)
		1	2
ci/config_functest.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
docker/Dockerfile	patch \|	diff1 \|	diff2 \|	blob \| history