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

Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/03/27 15:45:13 UTC

[iotdb] 06/11: Merge branch 'master' of https://github.com/apache/iotdb into InsertTabletNode

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

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

commit 4c0d494eda0c22948333c221039269130137e736
Merge: 6dda3bf a9d7b17
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Mar 24 22:24:15 2022 +0800

    Merge branch 'master' of https://github.com/apache/iotdb into InsertTabletNode

 .../resources/conf/iotdb-confignode.properties     |   7 +-
 .../src/assembly/resources/conf/logback-tool.xml   |  22 ++++
 confignode/src/assembly/resources/conf/logback.xml | 140 +++++++++++++++++++++
 .../assembly/resources/sbin/start-confignode.bat   |   2 +
 .../assembly/resources/sbin/start-confignode.sh    |   2 +
 .../iotdb/confignode/conf/ConfigNodeConf.java      |  23 ++++
 .../iotdb/confignode/conf/ConfigNodeConfCheck.java |  19 ++-
 .../confignode/conf/ConfigNodeDescriptor.java      |   4 +-
 .../consensus/response/DataNodesInfoDataSet.java   |  15 ++-
 .../statemachine/PartitionRegionStateMachine.java  |   2 +-
 .../iotdb/confignode/partition/PartitionTable.java |  33 +++--
 .../confignode/service/ConfigNodeCommandLine.java  |  10 +-
 .../confignode/service/executor/PlanExecutor.java  |  32 +----
 .../server/ConfigNodeRPCServerProcessor.java       |  13 +-
 .../apache/iotdb/commons/ServerCommandLine.java    |   6 +-
 15 files changed, 261 insertions(+), 69 deletions(-)