Merge "Adding ixia latency support for dynamic cgnapt"

author Ross Brattain <ross.b.brattain@intel.com>

Thu, 7 Sep 2017 15:24:46 +0000 (15:24 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Thu, 7 Sep 2017 15:24:46 +0000 (15:24 +0000)
author Ross Brattain <ross.b.brattain@intel.com>
Thu, 7 Sep 2017 15:24:46 +0000 (15:24 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Thu, 7 Sep 2017 15:24:46 +0000 (15:24 +0000)
diff --cc tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py
Simple merge
diff --cc yardstick/network_services/traffic_profile/ixia_rfc2544.py
Simple merge
author	Ross Brattain <ross.b.brattain@intel.com>
	Thu, 7 Sep 2017 15:24:46 +0000 (15:24 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Thu, 7 Sep 2017 15:24:46 +0000 (15:24 +0000)
		1	2
tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py	patch \|	diff1 \|	diff2 \|	blob \| history
yardstick/network_services/traffic_profile/ixia_rfc2544.py	patch \|	diff1 \|	diff2 \|	blob \| history