Merge "Read user & password from yardstick.conf in Grafana configuration"
authorRex Lee <limingjiang@huawei.com>
Tue, 26 Sep 2017 08:22:36 +0000 (08:22 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 26 Sep 2017 08:22:36 +0000 (08:22 +0000)
1  2 
api/resources/v1/env.py

Simple merge