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 955ef0c merge master
add 4bd325f merge master version2
No new revisions were added by this update.
Summary of changes:
pom.xml | 3 ++-
.../iotdb/db/engine/merge/BaseMergeSeriesTask.java | 14 ++++++-------
.../db/engine/merge/manage/MergeResource.java | 23 +++++-----------------
.../inplace/selector/InplaceMaxFileSelector.java | 11 ++++++-----
.../seqMerge/inplace/task/InplaceMergeTask.java | 8 +++-----
.../squeeze/selector/SqueezeMaxFileSelector.java | 11 ++++++-----
.../seqMerge/squeeze/task/SqueezeMergeTask.java | 6 ++----
.../selector/IndependenceMaxFileSelector.java | 4 ++--
.../independence/task/IndependenceMergeTask.java | 4 ++--
.../task/RegularizationMergeTask.java | 6 ++----
10 files changed, 36 insertions(+), 54 deletions(-)
