You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2021/01/05 01:31:37 UTC

[iotdb] branch master updated (8ed7071 -> bc9ae25)

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

jiangtian pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


    from 8ed7071  Merge pull request #2415 from mychaow/fix_merge_bug_2404
     add 9da7b72  split condition for waitPrevLog into multiple conditions
     add 7d43cbd  Merge branch 'master' into cluster_split_condition
     add 5913109  fix tests and code smells
     add bc9ae25  Merge pull request #2394 from apache/cluster_split_condition

No new revisions were added by this update.

Summary of changes:
 .../cluster/log/manage/CommittedEntryManager.java  |  5 ++--
 .../iotdb/cluster/log/manage/RaftLogManager.java   | 20 +++++++++----
 .../log/manage/UnCommittedEntryManager.java        | 10 +++++--
 .../iotdb/cluster/server/member/RaftMember.java    | 34 ++++++++++++----------
 4 files changed, 44 insertions(+), 25 deletions(-)