Merge "Fix role processing in Patrole"

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

Fri, 13 Apr 2018 15:42:53 +0000 (15:42 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Fri, 13 Apr 2018 15:42:53 +0000 (15:42 +0000)
author Cedric Ollivier <cedric.ollivier@orange.com>
Fri, 13 Apr 2018 15:42:53 +0000 (15:42 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Fri, 13 Apr 2018 15:42:53 +0000 (15:42 +0000)
diff --cc functest/opnfv_tests/openstack/tempest/tempest.py
Simple merge
diff --cc functest/tests/unit/openstack/tempest/test_tempest.py
Simple merge
author	Cedric Ollivier <cedric.ollivier@orange.com>
	Fri, 13 Apr 2018 15:42:53 +0000 (15:42 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Fri, 13 Apr 2018 15:42:53 +0000 (15:42 +0000)
		1	2
functest/opnfv_tests/openstack/tempest/tempest.py	patch \|	diff1 \|	diff2 \|	blob \| history
functest/tests/unit/openstack/tempest/test_tempest.py	patch \|	diff1 \|	diff2 \|	blob \| history