Merge "conf:Traffic-type naming convention and consistency"
authorMartin Klozik <martinx.klozik@intel.com>
Wed, 7 Dec 2016 14:01:07 +0000 (14:01 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 7 Dec 2016 14:01:07 +0000 (14:01 +0000)
1  2 
docs/configguide/trafficgen.rst

Simple merge