This is an automated email from the ASF dual-hosted git repository. xingtanzjr pushed a commit to branch yanshi in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit eda91919d9b19ba9c1709f0bfe05043fd4207229 Merge: d22e7f5 938c1f1 Author: Jinrui.Zhang <[email protected]> AuthorDate: Tue Mar 29 21:14:47 2022 +0800 Merge branch 'master' into yanshi .../iotdb/confignode/partition/PartitionTable.java | 12 +++-- .../server/ConfigNodeRPCServerProcessor.java | 22 +++++++-- .../confignode/consensus/RatisConsensusDemo.java | 56 ++++++++++++---------- .../server/ConfigNodeRPCServerProcessorTest.java | 7 --- docs/UserGuide/Process-Data/Alerting.md | 2 +- docs/zh/UserGuide/Process-Data/Alerting.md | 2 +- .../db/mpp/schedule/FragmentInstanceManager.java | 12 +++++ .../db/mpp/schedule/IFragmentInstanceManager.java | 12 ++++- .../db/mpp/schedule/task/FragmentInstanceTask.java | 4 +- 9 files changed, 86 insertions(+), 43 deletions(-)
