Merge "Add --hwlb options as a command line argument for SampleVNF"

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

Wed, 16 May 2018 10:26:02 +0000 (10:26 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Wed, 16 May 2018 10:26:02 +0000 (10:26 +0000)
author Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Wed, 16 May 2018 10:26:02 +0000 (10:26 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Wed, 16 May 2018 10:26:02 +0000 (10:26 +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>
	Wed, 16 May 2018 10:26:02 +0000 (10:26 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Wed, 16 May 2018 10:26:02 +0000 (10:26 +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