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

Posted to commits@iotdb.apache.org by ka...@apache.org on 2021/01/04 08:49:50 UTC

[iotdb] 01/02: Merge remote-tracking branch 'origin/master' into zeppelin_jdbc

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

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

commit d404d0c1c84938683a5acf84f119178c1560ac13
Merge: 08400ad d509f6e
Author: kr11 <3095717866.com>
AuthorDate: Mon Jan 4 12:31:27 2021 +0800

    Merge remote-tracking branch 'origin/master' into zeppelin_jdbc

 .../cluster/server/member/MetaGroupMember.java     | 25 +++++++++++++++
 .../iotdb/cluster/server/member/RaftMember.java    |  4 +--
 .../cluster/server/member/MetaGroupMemberTest.java | 37 ++++++++++++++++++++++
 3 files changed, 63 insertions(+), 3 deletions(-)