Merge "Generate pod.yaml from current context"

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

Wed, 20 Sep 2017 20:57:41 +0000 (20:57 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Wed, 20 Sep 2017 20:57:41 +0000 (20:57 +0000)
author Ross Brattain <ross.b.brattain@intel.com>
Wed, 20 Sep 2017 20:57:41 +0000 (20:57 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Wed, 20 Sep 2017 20:57:41 +0000 (20:57 +0000)
diff --cc yardstick/benchmark/contexts/heat.py
Simple merge
diff --cc yardstick/benchmark/scenarios/networking/vnf_generic.py
Simple merge
author	Ross Brattain <ross.b.brattain@intel.com>
	Wed, 20 Sep 2017 20:57:41 +0000 (20:57 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Wed, 20 Sep 2017 20:57:41 +0000 (20:57 +0000)
		1	2
yardstick/benchmark/contexts/heat.py	patch \|	diff1 \|	diff2 \|	blob \| history
yardstick/benchmark/scenarios/networking/vnf_generic.py	patch \|	diff1 \|	diff2 \|	blob \| history