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

[iotdb] 03/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 3951cae0ecfab8795a870a2e880ea4e5e8205f88
Merge: 66f881b 8df4d57
Author: qiaojialin <64...@qq.com>
AuthorDate: Sat Nov 7 13:55:51 2020 +0800

    Merge remote-tracking branch 'origin/master'

 .travis.yml                                              | 12 ++++++------
 .../java/org/apache/iotdb/db/conf/IoTDBConstant.java     |  1 +
 .../iotdb/db/query/executor/AggregationExecutor.java     | 16 ++++++++++++++--
 3 files changed, 21 insertions(+), 8 deletions(-)