Merge "always config conf.js in kibana_dashboard"
authorMorgan Richomme <morgan.richomme@orange.com>
Tue, 11 Oct 2016 12:06:39 +0000 (12:06 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 11 Oct 2016 12:06:39 +0000 (12:06 +0000)

Trivial merge