Merge "bugfix:fix all generic test cases in grafana"
authorkubi <jean.gaoliang@huawei.com>
Thu, 14 Jul 2016 01:54:00 +0000 (01:54 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 14 Jul 2016 01:54:00 +0000 (01:54 +0000)

Trivial merge