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

[iotdb] 13/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 d635aff6bbe98ff579582fe4b629a1bbe1690258
Merge: 1877b29 a5af774
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri Nov 13 10:18:31 2020 +0800

    Merge remote-tracking branch 'origin/master'

 server/src/assembly/resources/conf/iotdb-env.bat   |  2 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java | 67 +++++++++++++++-------
 2 files changed, 46 insertions(+), 23 deletions(-)