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:29 UTC

[iotdb] 18/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 1dbb539dde75d2bb3bb04a1716edcdefb6c63f14
Merge: 3ff97d7 5f287ae
Author: qiaojialin <64...@qq.com>
AuthorDate: Wed Nov 18 20:23:55 2020 +0800

    Merge remote-tracking branch 'origin/master'

 server/src/assembly/resources/conf/iotdb-engine.properties            | 4 ++--
 server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java        | 2 +-
 .../main/java/org/apache/iotdb/db/qp/strategy/PhysicalGenerator.java  | 2 +-
 .../test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)