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

Posted to commits@iotdb.apache.org by xi...@apache.org on 2022/05/11 05:17:26 UTC

[iotdb] 01/01: tMerge branch 'master' into xingtanzjr/scheduler

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

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

commit 04a3039d7dbe6a7d3dd012e49ea6e62a7fb9a6e7
Merge: d7f4a4a8ba f0ec7abe96
Author: Jinrui.Zhang <xi...@gmail.com>
AuthorDate: Wed May 11 13:17:12 2022 +0800

    tMerge branch 'master' into xingtanzjr/scheduler

 .github/workflows/main-unix.yml                    |  3 +-
 .github/workflows/main-win.yml                     |  3 +-
 .github/workflows/sonar-coveralls.yml              |  2 +-
 .../confignode/conf/ConfigNodeDescriptor.java      |  1 +
 distribution/pom.xml                               | 16 +++----
 distribution/src/assembly/all.xml                  | 12 ++---
 .../commons/auth/role/LocalFileRoleAccessor.java   |  8 ++--
 .../commons/auth/user/LocalFileUserAccessor.java   |  6 +--
 .../apache/iotdb/commons/conf/CommonConfig.java    | 16 +++++++
 .../org/apache/iotdb/db/conf/IoTDBDescriptor.java  |  1 +
 testcontainer/pom.xml                              | 52 +++++++++++-----------
 11 files changed, 69 insertions(+), 51 deletions(-)