Merge "Fix some configuration issues"
authorRuan HE <ruan.he@orange.com>
Sat, 9 Dec 2017 14:16:43 +0000 (14:16 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Sat, 9 Dec 2017 14:16:43 +0000 (14:16 +0000)

Trivial merge