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

Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/07/23 12:40:45 UTC

[incubator-iotdb] 01/02: Merge remote-tracking branch 'origin/rel/0.10' into for-releasing-0.10.1

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

hxd pushed a commit to branch for-releasing-0.10.1
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git

commit 67d6c91b8971865d1275f3755831214a9d92de9b
Merge: 07ca9ff a25db18
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Thu Jul 23 20:19:03 2020 +0800

    Merge remote-tracking branch 'origin/rel/0.10' into for-releasing-0.10.1

 .../apache/iotdb/hadoop/fileSystem/HDFSOutput.java |   4 +-
 .../org/apache/iotdb/db/conf/IoTDBConfigCheck.java |   2 +-
 .../engine/storagegroup/StorageGroupProcessor.java | 239 ++++++++++-----------
 .../writelog/recover/TsFileRecoverPerformer.java   |  26 +--
 .../iotdb/tsfile/read/TsFileCheckStatus.java       |   1 -
 .../iotdb/tsfile/read/TsFileSequenceReader.java    |  79 +++----
 .../tsfile/write/writer/LocalTsFileOutput.java     |   4 +-
 .../write/writer/RestorableTsFileIOWriter.java     |  42 ++--
 .../iotdb/tsfile/write/writer/TsFileOutput.java    |   4 +-
 .../write/writer/RestorableTsFileIOWriterTest.java |  17 +-
 10 files changed, 204 insertions(+), 214 deletions(-)