Merge "Rebase to fuel 10.0 for fuel@opnfv D release"
authorliang gao <jean.gaoliang@huawei.com>
Sun, 9 Oct 2016 01:51:07 +0000 (01:51 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Sun, 9 Oct 2016 01:51:07 +0000 (01:51 +0000)

Trivial merge