Merge "Integrate cloudify_ims in functest-features"

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

Sun, 20 Aug 2017 10:22:08 +0000 (10:22 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Sun, 20 Aug 2017 10:22:08 +0000 (10:22 +0000)
author Cedric Ollivier <cedric.ollivier@orange.com>
Sun, 20 Aug 2017 10:22:08 +0000 (10:22 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Sun, 20 Aug 2017 10:22:08 +0000 (10:22 +0000)
diff --cc docker/Dockerfile
Simple merge
diff --cc functest/ci/config_functest.yaml
Simple merge
author	Cedric Ollivier <cedric.ollivier@orange.com>
	Sun, 20 Aug 2017 10:22:08 +0000 (10:22 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Sun, 20 Aug 2017 10:22:08 +0000 (10:22 +0000)
		1	2
docker/Dockerfile	patch \|	diff1 \|	diff2 \|	blob \| history
functest/ci/config_functest.yaml	patch \|	diff1 \|	diff2 \|	blob \| history