Merge "Improvie TRex RFC2544 throughput calculation"

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

Tue, 21 Aug 2018 14:45:20 +0000 (14:45 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Tue, 21 Aug 2018 14:45:20 +0000 (14:45 +0000)
author Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Tue, 21 Aug 2018 14:45:20 +0000 (14:45 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Tue, 21 Aug 2018 14:45:20 +0000 (14:45 +0000)
diff --cc yardstick/network_services/traffic_profile/rfc2544.py
Simple merge
diff --cc yardstick/tests/unit/network_services/traffic_profile/test_rfc2544.py
Simple merge
author	Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
	Tue, 21 Aug 2018 14:45:20 +0000 (14:45 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Tue, 21 Aug 2018 14:45:20 +0000 (14:45 +0000)
		1	2
yardstick/network_services/traffic_profile/rfc2544.py	patch \|	diff1 \|	diff2 \|	blob \| history
yardstick/tests/unit/network_services/traffic_profile/test_rfc2544.py	patch \|	diff1 \|	diff2 \|	blob \| history