Merge "Fix setting `flow` configuration in TC yaml"

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

Thu, 23 Aug 2018 16:13:48 +0000 (16:13 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Thu, 23 Aug 2018 16:13:48 +0000 (16:13 +0000)
author Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
Thu, 23 Aug 2018 16:13:48 +0000 (16:13 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Thu, 23 Aug 2018 16:13:48 +0000 (16:13 +0000)
diff --cc yardstick/network_services/traffic_profile/ixia_rfc2544.py
Simple merge
author	Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>
	Thu, 23 Aug 2018 16:13:48 +0000 (16:13 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Thu, 23 Aug 2018 16:13:48 +0000 (16:13 +0000)