Merge "support config file"
authorwenjuan dong <dong.wenjuan@zte.com.cn>
Wed, 5 Jul 2017 14:29:27 +0000 (14:29 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 5 Jul 2017 14:29:27 +0000 (14:29 +0000)

Trivial merge