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/12 06:54:23 UTC

[incubator-iotdb] 01/01: Merge pull request #1355 from apache/dev_new_merge_rebase

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

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

commit cdabbd3e56bc61c83c290ca401be73f5618ad6fb
Merge: 7512021 1fb2533
Author: gwmh <16...@qq.com>
AuthorDate: Fri Jun 12 14:54:15 2020 +0800

    Merge pull request #1355 from apache/dev_new_merge_rebase
    
    rebase merge

 .../engine/merge/seqMerge/inplace/task/MergeMultiChunkTask.java   | 4 ++--
 .../iotdb/db/engine/storagegroup/StorageGroupProcessor.java       | 8 +-------
 2 files changed, 3 insertions(+), 9 deletions(-)