This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch dev_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from a426228 Merge branch 'master' into dev_merge
add d88cd83 fix unupdated device min time
No new revisions were added by this update.
Summary of changes:
.../apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java | 9 +++++++--
.../java/org/apache/iotdb/db/integration/IoTDBAggregationIT.java | 8 ++++++++
.../java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java | 4 +---
.../src/main/java/org/apache/iotdb/tsfile/read/common/Chunk.java | 5 +++--
.../org/apache/iotdb/tsfile/read/controller/ChunkLoaderImpl.java | 2 +-
.../org/apache/iotdb/tsfile/read/reader/page/PageReader.java | 2 +-
6 files changed, 21 insertions(+), 9 deletions(-)