Merge "add compass-core conf/ into compass4nfv"
authorJustin chi <chigang@huawei.com>
Mon, 5 Dec 2016 12:41:23 +0000 (12:41 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 5 Dec 2016 12:41:23 +0000 (12:41 +0000)

Trivial merge