Merge "update cloudify_ims case"

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

Wed, 15 Feb 2017 10:24:40 +0000 (10:24 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Wed, 15 Feb 2017 10:24:40 +0000 (10:24 +0000)
author valentin boucher <valentin.boucher@orange.com>
Wed, 15 Feb 2017 10:24:40 +0000 (10:24 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Wed, 15 Feb 2017 10:24:40 +0000 (10:24 +0000)
diff --cc functest/ci/testcases.yaml
Simple merge
diff --cc functest/utils/functest_utils.py
Simple merge
author	valentin boucher <valentin.boucher@orange.com>
	Wed, 15 Feb 2017 10:24:40 +0000 (10:24 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Wed, 15 Feb 2017 10:24:40 +0000 (10:24 +0000)
		1	2
functest/ci/testcases.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
functest/utils/functest_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history