Merge "Bugfix: yardstick env grafana return http error"
authorJing Lu <lvjing5@huawei.com>
Tue, 24 Jul 2018 07:01:35 +0000 (07:01 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 24 Jul 2018 07:01:35 +0000 (07:01 +0000)

Trivial merge