Merge "Add test library name update in DMF and mainflows" into stable/gambia

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

Tue, 30 Oct 2018 20:36:49 +0000 (20:36 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Tue, 30 Oct 2018 20:36:49 +0000 (20:36 +0000)
author Emma Foley <emma.l.foley@intel.com>
Tue, 30 Oct 2018 20:36:49 +0000 (20:36 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Tue, 30 Oct 2018 20:36:49 +0000 (20:36 +0000)
diff --cc yardstick/network_services/vnf_generic/vnf/tg_landslide.py
Simple merge
diff --cc yardstick/tests/unit/network_services/vnf_generic/vnf/test_tg_landslide.py
Simple merge
author	Emma Foley <emma.l.foley@intel.com>
	Tue, 30 Oct 2018 20:36:49 +0000 (20:36 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Tue, 30 Oct 2018 20:36:49 +0000 (20:36 +0000)
		1	2
yardstick/network_services/vnf_generic/vnf/tg_landslide.py	patch \|	diff1 \|	diff2 \|	blob \| history
yardstick/tests/unit/network_services/vnf_generic/vnf/test_tg_landslide.py	patch \|	diff1 \|	diff2 \|	blob \| history