Merge "Support os-odl-nofeature-* as new scenarios"

author Alex Yang <yangyang1@zte.com.cn>

Fri, 4 Aug 2017 07:47:09 +0000 (07:47 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Fri, 4 Aug 2017 07:47:09 +0000 (07:47 +0000)
author Alex Yang <yangyang1@zte.com.cn>
Fri, 4 Aug 2017 07:47:09 +0000 (07:47 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Fri, 4 Aug 2017 07:47:09 +0000 (07:47 +0000)
diff --cc ci/deploy/deploy.sh
Simple merge
diff --cc deploy/tempest.py
Simple merge
author	Alex Yang <yangyang1@zte.com.cn>
	Fri, 4 Aug 2017 07:47:09 +0000 (07:47 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Fri, 4 Aug 2017 07:47:09 +0000 (07:47 +0000)
		1	2
ci/deploy/deploy.sh	patch \|	diff1 \|	diff2 \|	blob \| history
deploy/tempest.py	patch \|	diff1 \|	diff2 \|	blob \| history