Merge "Delete functest.utils.functest_logger"

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

Fri, 5 May 2017 07:50:31 +0000 (07:50 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Fri, 5 May 2017 07:50:31 +0000 (07:50 +0000)
author Jose Lausuch <jose.lausuch@ericsson.com>
Fri, 5 May 2017 07:50:31 +0000 (07:50 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Fri, 5 May 2017 07:50:31 +0000 (07:50 +0000)
diff --cc functest/opnfv_tests/openstack/tempest/conf_utils.py
Simple merge
diff --cc functest/utils/openstack_utils.py
Simple merge
author	Jose Lausuch <jose.lausuch@ericsson.com>
	Fri, 5 May 2017 07:50:31 +0000 (07:50 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Fri, 5 May 2017 07:50:31 +0000 (07:50 +0000)
		1	2
functest/opnfv_tests/openstack/tempest/conf_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history
functest/utils/openstack_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history