Merge "VNF characterization scale_up test, untested"
authorYu Yang (Gabriel) <Gabriel.yuyang@huawei.com>
Thu, 10 Aug 2017 08:33:28 +0000 (08:33 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 10 Aug 2017 08:33:28 +0000 (08:33 +0000)

Trivial merge