Merge "Add "os_cloud_config" as a new context flag parameter"

author Emma Foley <emma.l.foley@intel.com>

Fri, 4 May 2018 14:54:16 +0000 (14:54 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Fri, 4 May 2018 14:54:16 +0000 (14:54 +0000)
author Emma Foley <emma.l.foley@intel.com>
Fri, 4 May 2018 14:54:16 +0000 (14:54 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Fri, 4 May 2018 14:54:16 +0000 (14:54 +0000)
diff --cc yardstick/common/openstack_utils.py
Simple merge
diff --cc yardstick/tests/unit/common/test_openstack_utils.py
Simple merge
author	Emma Foley <emma.l.foley@intel.com>
	Fri, 4 May 2018 14:54:16 +0000 (14:54 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Fri, 4 May 2018 14:54:16 +0000 (14:54 +0000)
		1	2
yardstick/common/openstack_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history
yardstick/tests/unit/common/test_openstack_utils.py	patch \|	diff1 \|	diff2 \|	blob \| history