Merge "Remove call to fetch_os_creds.sh"

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

Tue, 6 Jun 2017 13:36:06 +0000 (13:36 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Tue, 6 Jun 2017 13:36:06 +0000 (13:36 +0000)
author Jose Lausuch <jose.lausuch@ericsson.com>
Tue, 6 Jun 2017 13:36:06 +0000 (13:36 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Tue, 6 Jun 2017 13:36:06 +0000 (13:36 +0000)
diff --cc functest/ci/prepare_env.py
Simple merge
diff --cc functest/tests/unit/ci/test_prepare_env.py
Simple merge
author	Jose Lausuch <jose.lausuch@ericsson.com>
	Tue, 6 Jun 2017 13:36:06 +0000 (13:36 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Tue, 6 Jun 2017 13:36:06 +0000 (13:36 +0000)
		1	2
functest/ci/prepare_env.py	patch \|	diff1 \|	diff2 \|	blob \| history
functest/tests/unit/ci/test_prepare_env.py	patch \|	diff1 \|	diff2 \|	blob \| history