Merge "Fix inventory.ini for build_yardstick_image"
authorzhihui wu <wu.zhihui1@zte.com.cn>
Wed, 3 Jan 2018 00:56:43 +0000 (00:56 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 3 Jan 2018 00:56:43 +0000 (00:56 +0000)

Trivial merge