This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from bb5b9c9 fix conflict
add 32fd45d fix bug
No new revisions were added by this update.
Summary of changes:
.../engine/storagegroup/StorageGroupProcessor.java | 4 ++-
.../HotCompactionMergeTaskPoolManager.java | 33 +++++++++-------------
.../level/LevelTsFileManagement.java | 3 ++
3 files changed, 20 insertions(+), 20 deletions(-)
