Merge "Update orchestrator (cloudify) version from 3.2 to 3.3"

author boucherv <valentin.boucher@orange.com>

Wed, 30 Dec 2015 08:08:33 +0000 (08:08 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Wed, 30 Dec 2015 08:08:33 +0000 (08:08 +0000)
author boucherv <valentin.boucher@orange.com>
Wed, 30 Dec 2015 08:08:33 +0000 (08:08 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Wed, 30 Dec 2015 08:08:33 +0000 (08:08 +0000)
diff --cc testcases/config_functest.yaml
Simple merge
diff --cc testcases/functest_utils.py
Simple merge
author	boucherv <valentin.boucher@orange.com>
	Wed, 30 Dec 2015 08:08:33 +0000 (08:08 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Wed, 30 Dec 2015 08:08:33 +0000 (08:08 +0000)
		1	2
testcases/config_functest.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
testcases/functest_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history