Merge "Do not start collectd twice when SampleVNF is running on Baremetal" into stabl...

author Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>

Fri, 22 Jun 2018 11:43:07 +0000 (11:43 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Fri, 22 Jun 2018 11:43:07 +0000 (11:43 +0000)
author Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Fri, 22 Jun 2018 11:43:07 +0000 (11:43 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Fri, 22 Jun 2018 11:43:07 +0000 (11:43 +0000)
diff --cc tests/unit/network_services/vnf_generic/vnf/test_sample_vnf.py
Simple merge
diff --cc yardstick/network_services/vnf_generic/vnf/sample_vnf.py
Simple merge
author	Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
	Fri, 22 Jun 2018 11:43:07 +0000 (11:43 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Fri, 22 Jun 2018 11:43:07 +0000 (11:43 +0000)
		1	2
tests/unit/network_services/vnf_generic/vnf/test_sample_vnf.py	patch \|	diff1 \|	diff2 \|	blob \| history
yardstick/network_services/vnf_generic/vnf/sample_vnf.py	patch \|	diff1 \|	diff2 \|	blob \| history