Merge "Add support for Bottlenecks' new framework and potential installers"
authorJun Li <lijun_1203@126.com>
Mon, 31 Jul 2017 08:30:58 +0000 (08:30 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 31 Jul 2017 08:30:58 +0000 (08:30 +0000)

Trivial merge