Merge "Add ability to reuse existing OpenStack set-up"

author Ross Brattain <ross.b.brattain@intel.com>

Thu, 1 Mar 2018 21:17:05 +0000 (21:17 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Thu, 1 Mar 2018 21:17:05 +0000 (21:17 +0000)
author Ross Brattain <ross.b.brattain@intel.com>
Thu, 1 Mar 2018 21:17:05 +0000 (21:17 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Thu, 1 Mar 2018 21:17:05 +0000 (21:17 +0000)
diff --cc yardstick/benchmark/core/task.py
Simple merge
diff --cc yardstick/tests/unit/benchmark/core/test_task.py
Simple merge
author	Ross Brattain <ross.b.brattain@intel.com>
	Thu, 1 Mar 2018 21:17:05 +0000 (21:17 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Thu, 1 Mar 2018 21:17:05 +0000 (21:17 +0000)
		1	2
yardstick/benchmark/core/task.py	patch \|	diff1 \|	diff2 \|	blob \| history
yardstick/tests/unit/benchmark/core/test_task.py	patch \|	diff1 \|	diff2 \|	blob \| history