Merge "refactor rally using new constants provider"

author Serena Feng <feng.xiaowei@zte.com.cn>

Mon, 26 Dec 2016 02:39:24 +0000 (02:39 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Mon, 26 Dec 2016 02:39:24 +0000 (02:39 +0000)
author Serena Feng <feng.xiaowei@zte.com.cn>
Mon, 26 Dec 2016 02:39:24 +0000 (02:39 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Mon, 26 Dec 2016 02:39:24 +0000 (02:39 +0000)
diff --cc functest/ci/config_functest.yaml
Simple merge
diff --cc functest/utils/functest_constants.py
Simple merge
author	Serena Feng <feng.xiaowei@zte.com.cn>
	Mon, 26 Dec 2016 02:39:24 +0000 (02:39 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Mon, 26 Dec 2016 02:39:24 +0000 (02:39 +0000)
		1	2
functest/ci/config_functest.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
functest/utils/functest_constants.py	patch \|	diff1 \|	diff2 \|	blob \| history