You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by ka...@apache.org on 2020/12/21 04:51:19 UTC

[iotdb] 02/02: Merge branch 'master' into bug_zeppelin_dependency

This is an automated email from the ASF dual-hosted git repository.

kangrong pushed a commit to branch bug_zeppelin_dependency
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit fe0bcc3b978c1d4dd48464534f21c26d5abb0342
Merge: cbbc433 59e9b9c
Author: kr11 <3095717866.com>
AuthorDate: Mon Dec 21 12:49:49 2020 +0800

    Merge branch 'master' into bug_zeppelin_dependency

 .../src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java | 4 ++--
 .../org/apache/iotdb/cluster/server/member/MetaGroupMember.java    | 2 +-
 .../java/org/apache/iotdb/cluster/server/member/RaftMember.java    | 2 +-
 docs/UserGuide/System Tools/Sync Tool.md                           | 2 +-
 docs/zh/UserGuide/System Tools/Sync Tool.md                        | 2 +-
 .../main/java/org/apache/iotdb/db/metadata/logfile/MLogWriter.java | 2 +-
 site/src/main/.vuepress/theme/global-components/Contributor.vue    | 7 +++++++
 7 files changed, 14 insertions(+), 7 deletions(-)