Merge "refstack client integration"

author Morgan Richomme <morgan.richomme@orange.com>

Wed, 15 Mar 2017 09:48:32 +0000 (09:48 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Wed, 15 Mar 2017 09:48:32 +0000 (09:48 +0000)
author Morgan Richomme <morgan.richomme@orange.com>
Wed, 15 Mar 2017 09:48:32 +0000 (09:48 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Wed, 15 Mar 2017 09:48:32 +0000 (09:48 +0000)
diff --cc docker/Dockerfile
Simple merge
diff --cc functest/ci/config_functest.yaml
Simple merge
diff --cc functest/opnfv_tests/openstack/tempest/conf_utils.py
Simple merge
author	Morgan Richomme <morgan.richomme@orange.com>
	Wed, 15 Mar 2017 09:48:32 +0000 (09:48 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Wed, 15 Mar 2017 09:48:32 +0000 (09:48 +0000)
		1	2
docker/Dockerfile	patch \|	diff1 \|	diff2 \|	blob \| history
functest/ci/config_functest.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
functest/opnfv_tests/openstack/tempest/conf_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history