This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch enhance_merge_management
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from ecfe945 Merge branch 'master' into enhance_merge_management
add 02a0795 fix test and task comparison
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/iotdb/db/engine/merge/manage/MergeFuture.java | 4 ++--
.../test/java/org/apache/iotdb/db/integration/IoTDBMergeTest.java | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
