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/06/10 08:38:37 UTC

[incubator-iotdb] branch dev_new_merge updated (a966d20 -> 86ead2b)

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

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


    from a966d20  merge master
     add 86ead2b  fix resource lock reference

No new revisions were added by this update.

Summary of changes:
 .../iotdb/db/engine/merge/seqMerge/squeeze/task/SqueezeMergeTask.java | 4 ++--
 .../merge/sizeMerge/regularization/task/RegularizationMergeTask.java  | 4 ++--
 server/src/main/java/org/apache/iotdb/db/utils/MergeUtils.java        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)