Merge "Prepare Promise integration in Functest"

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

Tue, 12 Jan 2016 09:58:49 +0000 (09:58 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Tue, 12 Jan 2016 09:58:49 +0000 (09:58 +0000)
author Morgan Richomme <morgan.richomme@orange.com>
Tue, 12 Jan 2016 09:58:49 +0000 (09:58 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Tue, 12 Jan 2016 09:58:49 +0000 (09:58 +0000)
diff --cc docker/Dockerfile
Simple merge
diff --cc testcases/config_functest.yaml
Simple merge
author	Morgan Richomme <morgan.richomme@orange.com>
	Tue, 12 Jan 2016 09:58:49 +0000 (09:58 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Tue, 12 Jan 2016 09:58:49 +0000 (09:58 +0000)
		1	2
docker/Dockerfile	patch \|	diff1 \|	diff2 \|	blob \| history
testcases/config_functest.yaml	patch \|	diff1 \|	diff2 \|	blob \| history