You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/07/25 06:52:38 UTC

[incubator-iotdb] branch dev_merge updated (5855477 -> 155cec3)

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 5855477  Merge branch 'master' into dev_merge
     add 155cec3  fix incompatible interfaces

No new revisions were added by this update.

Summary of changes:
 .../apache/iotdb/db/engine/cache/DeviceMetaDataCache.java   |  8 +++++---
 .../apache/iotdb/db/engine/cache/TsFileMetaDataCache.java   | 11 +++++++----
 .../apache/iotdb/db/engine/cache/TsFileMetadataUtils.java   | 13 +++++++------
 .../reader/resourceRelated/SeqResourceIterateReader.java    |  2 +-
 .../resourceRelated/SeqResourceReaderByTimestamp.java       |  2 +-
 .../reader/resourceRelated/UnseqResourceMergeReader.java    |  2 +-
 .../resourceRelated/UnseqResourceReaderByTimestamp.java     |  2 +-
 7 files changed, 23 insertions(+), 17 deletions(-)