Merge "Added means to override the RC file credentials."

author Linda Wang <wangwulin@huawei.com>

Thu, 24 Aug 2017 14:23:39 +0000 (14:23 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Thu, 24 Aug 2017 14:23:39 +0000 (14:23 +0000)
author Linda Wang <wangwulin@huawei.com>
Thu, 24 Aug 2017 14:23:39 +0000 (14:23 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Thu, 24 Aug 2017 14:23:39 +0000 (14:23 +0000)
diff --cc functest/ci/config_functest.yaml
Simple merge
diff --cc functest/opnfv_tests/openstack/vping/vping_base.py
Simple merge
author	Linda Wang <wangwulin@huawei.com>
	Thu, 24 Aug 2017 14:23:39 +0000 (14:23 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Thu, 24 Aug 2017 14:23:39 +0000 (14:23 +0000)
		1	2
functest/ci/config_functest.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
functest/opnfv_tests/openstack/vping/vping_base.py	patch \|	diff1 \|	diff2 \|	blob \| history