You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/12/22 13:19:05 UTC
[iotdb] 01/02: Merge remote-tracking branch 'origin/master' into
change_rpc_port
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch change_rpc_port
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 49d7c40489540e0ceef4d67f6e83b27da03c2a21
Merge: 20aa060 2acfd66
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Tue Dec 22 15:20:59 2020 +0800
Merge remote-tracking branch 'origin/master' into change_rpc_port
.github/workflows/sonar_and_coverall.yml | 2 +-
.../java/org/apache/iotdb/cluster/ClusterMain.java | 6 +-
.../iotdb/cluster/client/DataClientProvider.java | 17 +-
.../cluster/client/async/AsyncClientPool.java | 11 +-
.../iotdb/cluster/client/sync/SyncClientPool.java | 21 ++-
.../apache/iotdb/cluster/metadata/CMManager.java | 4 +-
.../cluster/query/fill/ClusterPreviousFill.java | 11 +-
.../iotdb/cluster/query/reader/DataSourceInfo.java | 2 +-
.../cluster/server/member/MetaGroupMember.java | 14 +-
.../iotdb/cluster/server/member/RaftMember.java | 2 +-
.../cluster/client/DataClientProviderTest.java | 12 +-
.../Ecosystem Integration/Zeppelin-IoTDB.md | 184 ++++++++++++++++++++
docs/UserGuide/System Tools/Sync Tool.md | 2 +-
.../Ecosystem Integration/Zeppelin-IoTDB.md | 186 +++++++++++++++++++++
docs/zh/UserGuide/System Tools/Sync Tool.md | 2 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 4 +-
.../engine/storagegroup/StorageGroupProcessor.java | 5 +-
.../iotdb/db/metadata/logfile/MLogWriter.java | 2 +-
.../theme/global-components/Contributor.vue | 7 +
zeppelin-interpreter/README.md | 186 ---------------------
zeppelin-interpreter/pom.xml | 32 +++-
21 files changed, 475 insertions(+), 237 deletions(-)