This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch native_raft
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from d89c021b523 Merge branch 'master' into native_raft
add f7811d3dd94 fix merge
No new revisions were added by this update.
Summary of changes:
iotdb-core/consensus/pom.xml | 10 ++++++++++
.../main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 16 ----------------
.../db/protocol/thrift/impl/ClientRPCServiceImpl.java | 4 ++++
.../db/queryengine/plan/parser/StatementGenerator.java | 6 ++++--
.../dataregion/flush/MemTableFlushTask.java | 4 ++--
iotdb-protocol/thrift-raft/pom.xml | 6 +++++-
6 files changed, 25 insertions(+), 21 deletions(-)
