This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a change to branch rel/0.12 in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 424afa4 [To rel/0.12] fix SGP recover bug (#3947)
add a90444d [To rel/0.12] To 0.12 fix merge error (#3948)
No new revisions were added by this update.
Summary of changes:
pom.xml | 53 ++++++++++++++++------
.../iotdb/db/engine/merge/task/MergeTask.java | 9 ++--
2 files changed, 44 insertions(+), 18 deletions(-)
