This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch cluster_new
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 3040a4d Merge branch 'master' into cluster_new
add 3253286 fix merge master
No new revisions were added by this update.
Summary of changes:
.../iotdb/cluster/server/DataClusterServer.java | 4 ++--
.../iotdb/cluster/server/MetaClusterServer.java | 4 ++--
.../server/handlers/caller/HeartbeatHandler.java | 6 +++---
.../cluster/server/heartbeat/HeartbeatThread.java | 4 ++--
.../cluster/server/member/MetaGroupMember.java | 10 ++++++----
.../iotdb/cluster/server/member/RaftMember.java | 14 ++++++-------
.../cluster/common/TestRemoteFileSnapshot.java | 4 ++--
.../handlers/caller/HeartbeatHandlerTest.java | 6 +++---
.../server/heartbeat/DataHeartbeatThreadTest.java | 8 ++++----
.../server/heartbeat/HeartbeatThreadTest.java | 8 ++++----
.../server/heartbeat/MetaHeartbeatThreadTest.java | 10 +++++-----
.../cluster/server/member/DataGroupMemberTest.java | 7 ++++---
.../cluster/server/member/MetaGroupMemberTest.java | 23 ++++++++--------------
.../org/apache/iotdb/db/engine/StorageEngine.java | 4 ++--
service-rpc/src/main/thrift/cluster.thrift | 8 ++++----
.../java/org/apache/iotdb/session/Session.java | 8 +++++---
16 files changed, 62 insertions(+), 66 deletions(-)
