Merge "Add support for VXLAN latency"

author Alec Hothan <ahothan@cisco.com>

Wed, 23 Oct 2019 15:25:43 +0000 (15:25 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Wed, 23 Oct 2019 15:25:43 +0000 (15:25 +0000)
author Alec Hothan <ahothan@cisco.com>
Wed, 23 Oct 2019 15:25:43 +0000 (15:25 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Wed, 23 Oct 2019 15:25:43 +0000 (15:25 +0000)
diff --cc nfvbench/traffic_client.py
Simple merge
diff --cc nfvbench/traffic_gen/trex_gen.py
Simple merge
author	Alec Hothan <ahothan@cisco.com>
	Wed, 23 Oct 2019 15:25:43 +0000 (15:25 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Wed, 23 Oct 2019 15:25:43 +0000 (15:25 +0000)
		1	2
nfvbench/traffic_client.py	patch \|	diff1 \|	diff2 \|	blob \| history
nfvbench/traffic_gen/trex_gen.py	patch \|	diff1 \|	diff2 \|	blob \| history