Merge "replace build.conf with yaml"
authorJustin chi <chigang@huawei.com>
Sun, 25 Jun 2017 09:18:54 +0000 (09:18 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Sun, 25 Jun 2017 09:18:54 +0000 (09:18 +0000)

Trivial merge