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

Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/11/22 10:15:13 UTC

[iotdb] 02/21: Merge remote-tracking branch 'origin/master'

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

qiaojialin pushed a commit to branch fix_doc_sg
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 66f881b512c04a890aa3e74576107770f46a6041
Merge: 58b7825 e5418c4
Author: qiaojialin <64...@qq.com>
AuthorDate: Sat Nov 7 11:48:40 2020 +0800

    Merge remote-tracking branch 'origin/master'

 .travis.yml                                        |   2 +-
 cli/src/main/java/org/apache/iotdb/cli/Cli.java    |   4 +-
 cli/src/main/java/org/apache/iotdb/cli/WinCli.java |   3 +-
 .../org/apache/iotdb/db/engine/StorageEngine.java  |  15 +++-
 .../db/engine/compaction/TsFileManagement.java     |   6 +-
 .../org/apache/iotdb/db/metadata/MetaUtils.java    |  18 +++-
 .../apache/iotdb/db/service/RegisterManager.java   |   1 +
 .../org/apache/iotdb/db/service/TSServiceImpl.java |   7 +-
 .../apache/iotdb/db/metadata/MetaUtilsTest.java    |  24 +++--
 .../db/sync/receiver/load/FileLoaderTest.java      |   2 +-
 .../recover/SyncReceiverLogAnalyzerTest.java       |   2 +-
 .../apache/iotdb/db/utils/EnvironmentUtils.java    | 100 +++++++++++++--------
 server/src/test/resources/logback.xml              |   2 +
 .../apache/iotdb/session/IoTDBSessionSimpleIT.java |  56 ++++++++++++
 14 files changed, 175 insertions(+), 67 deletions(-)