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

Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/01/04 14:29:59 UTC

[iotdb] branch NewTsFile updated (2536cda -> 235200a)

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a change to branch NewTsFile
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


    from 2536cda  Merge branch 'master' of https://github.com/apache/iotdb into NewTsFile
     add 235200a  resolve conflicts

No new revisions were added by this update.

Summary of changes:
 .../main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)