Merge "Fix dict conversion in tempest.conf"

author Cedric Ollivier <cedric.ollivier@orange.com>

Sat, 8 Sep 2018 08:00:36 +0000 (08:00 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Sat, 8 Sep 2018 08:00:36 +0000 (08:00 +0000)
author Cedric Ollivier <cedric.ollivier@orange.com>
Sat, 8 Sep 2018 08:00:36 +0000 (08:00 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Sat, 8 Sep 2018 08:00:36 +0000 (08:00 +0000)
diff --cc functest/opnfv_tests/openstack/tempest/conf_utils.py
Simple merge
diff --cc functest/tests/unit/openstack/tempest/test_conf_utils.py
Simple merge
author	Cedric Ollivier <cedric.ollivier@orange.com>
	Sat, 8 Sep 2018 08:00:36 +0000 (08:00 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Sat, 8 Sep 2018 08:00:36 +0000 (08:00 +0000)
		1	2
functest/opnfv_tests/openstack/tempest/conf_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history
functest/tests/unit/openstack/tempest/test_conf_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history