Merge "xci: Allow variable overrides from external scenarios"

author Markos Chandras <mchandras@suse.de>

Tue, 5 Dec 2017 17:27:00 +0000 (17:27 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Tue, 5 Dec 2017 17:27:00 +0000 (17:27 +0000)
author Markos Chandras <mchandras@suse.de>
Tue, 5 Dec 2017 17:27:00 +0000 (17:27 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Tue, 5 Dec 2017 17:27:00 +0000 (17:27 +0000)
diff --cc xci/playbooks/get-opnfv-scenario-requirements.yml
Simple merge
diff --cc xci/xci-deploy.sh
Simple merge
author	Markos Chandras <mchandras@suse.de>
	Tue, 5 Dec 2017 17:27:00 +0000 (17:27 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Tue, 5 Dec 2017 17:27:00 +0000 (17:27 +0000)
		1	2
xci/playbooks/get-opnfv-scenario-requirements.yml	patch \|	diff1 \|	diff2 \|	blob \| history
xci/xci-deploy.sh	patch \|	diff1 \|	diff2 \|	blob \| history