You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ej...@apache.org on 2020/11/11 10:17:03 UTC

[iotdb] branch rel-0.11-fix updated (b9ab778 -> 001e429)

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

ejttianyu pushed a change to branch rel-0.11-fix
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


    from b9ab778  Merge branch 'rel/0.11' of github.com:apache/iotdb into rel/0.11
     add 001e429  fix v1

No new revisions were added by this update.

Summary of changes:
 .../iotdb/db/engine/merge/task/MergeTask.java       |  2 --
 .../apache/iotdb/db/engine/merge/MergeLogTest.java  |  3 ++-
 .../iotdb/db/engine/merge/MergeOverLapTest.java     |  3 +--
 .../apache/iotdb/db/engine/merge/MergePerfTest.java |  3 +--
 .../apache/iotdb/db/engine/merge/MergeTaskTest.java | 21 ++++++++-------------
 .../org/apache/iotdb/db/engine/merge/MergeTest.java | 18 ++++++++++++++++++
 6 files changed, 30 insertions(+), 20 deletions(-)