This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch DeleteInsertBug in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit e7f41226778cd030a45ee3ca9727bc0d3560a091 Merge: acb1b24 e89fe25 Author: JackieTien97 <[email protected]> AuthorDate: Wed Apr 22 10:24:10 2020 +0800 Merge remote-tracking branch 'origin' into DeleteInsertBug .../org/apache/iotdb/client/AbstractClient.java | 83 +++++++++++++------ .../UserGuide/7-Ecosystem Integration/1-Grafana.md | 70 ++++++++++++---- .../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 | 10 ++- .../org/apache/iotdb/db/metadata/MManager.java | 4 +- .../org/apache/iotdb/db/service/TSServiceImpl.java | 2 +- .../java/org/apache/iotdb/session/Session.java | 19 ----- 10 files changed, 339 insertions(+), 153 deletions(-)
