You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/05/01 02:41:39 UTC
[incubator-iotdb] 03/04: Merge branch 'rel/0.9' of
github.com:apache/incubator-iotdb into rel/0.9
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.9
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit d89458c4628be22bfff47bc6530b954847fb1adc
Merge: 295d3bf 3d269b1
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri May 1 10:16:36 2020 +0800
Merge branch 'rel/0.9' of github.com:apache/incubator-iotdb into rel/0.9
.../UserGuide/7-Ecosystem Integration/1-Grafana.md | 77 +++++++++++++-----
.../UserGuide/7-Ecosystem Integration/1-Grafana.md | 65 +++++++++++----
grafana/readme.md | 74 ++++++++++++-----
grafana/readme_zh.md | 95 +++++++++++++++-------
.../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 70 +++++++++++++---
.../main/resources}/application.properties | 13 ++-
.../src/main/java/org/apache/iotdb/jdbc/Utils.java | 34 +++-----
.../test/java/org/apache/iotdb/jdbc/UtilsTest.java | 4 +-
8 files changed, 311 insertions(+), 121 deletions(-)