Merge "Spawn instances in nova availability zone"

author Jose Lausuch <jose.lausuch@ericsson.com>

Fri, 14 Oct 2016 14:27:43 +0000 (14:27 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Fri, 14 Oct 2016 14:27:43 +0000 (14:27 +0000)
author Jose Lausuch <jose.lausuch@ericsson.com>
Fri, 14 Oct 2016 14:27:43 +0000 (14:27 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Fri, 14 Oct 2016 14:27:43 +0000 (14:27 +0000)
diff --cc testcases/features/sfc/sfc.py
Simple merge
diff --cc testcases/features/sfc/sfc_colorado1.py
Simple merge
author	Jose Lausuch <jose.lausuch@ericsson.com>
	Fri, 14 Oct 2016 14:27:43 +0000 (14:27 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Fri, 14 Oct 2016 14:27:43 +0000 (14:27 +0000)
		1	2
testcases/features/sfc/sfc.py	patch \|	diff1 \|	diff2 \|	blob \| history
testcases/features/sfc/sfc_colorado1.py	patch \|	diff1 \|	diff2 \|	blob \| history