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/12/11 09:22:42 UTC

[iotdb] 02/03: Merge remote-tracking branch 'origin/rel/0.11' into rel/0.11

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

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

commit 130333133133bffbff104c7791e18bd6022dced7
Merge: 5a905fa 8971ffc
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri Dec 11 16:35:02 2020 +0800

    Merge remote-tracking branch 'origin/rel/0.11' into rel/0.11

 server/src/assembly/resources/conf/iotdb-engine.properties     |  8 +++++++-
 server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java |  2 +-
 .../src/main/java/org/apache/iotdb/db/service/RPCService.java  | 10 ++++++----
 .../apache/iotdb/db/service/thrift/ThriftServiceThread.java    |  8 ++++----
 .../org/apache/iotdb/db/sync/receiver/SyncServerManager.java   |  4 +++-
 5 files changed, 21 insertions(+), 11 deletions(-)