Merge "Bugfix: the config files in useeconfig will cover user's config"
authorLeo wang <grakiss.wanglei@huawei.com>
Wed, 6 Sep 2017 01:34:19 +0000 (01:34 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 6 Sep 2017 01:34:19 +0000 (01:34 +0000)

Trivial merge