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:22 UTC
[incubator-iotdb] branch dev_new_merge updated (7512021 -> cdabbd3)
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 7512021 fix processor
add 64063bd fix merge bug
add f1011d4 inplace fix
add 1fb2533 Merge branch 'dev_new_merge' into dev_new_merge_rebase
new cdabbd3 Merge pull request #1355 from apache/dev_new_merge_rebase
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../engine/merge/seqMerge/inplace/task/MergeMultiChunkTask.java | 4 ++--
.../iotdb/db/engine/storagegroup/StorageGroupProcessor.java | 8 +-------
2 files changed, 3 insertions(+), 9 deletions(-)
[incubator-iotdb] 01/01: Merge pull request #1355 from
apache/dev_new_merge_rebase
Posted by ej...@apache.org.
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(-)