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

Posted to commits@iotdb.apache.org by hx...@apache.org on 2022/12/18 11:00:35 UTC

[iotdb] 02/03: Merge remote-tracking branch 'origin/master' into jenkins-disable-integration

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

hxd pushed a commit to branch jenkins-disable-integration
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit ae1ffa0af6106efe052a2a177dc1a1e85d8d4344
Merge: 22c817b627 86919fb9f9
Author: xiangdong huang <hx...@timecho.com>
AuthorDate: Sun Dec 18 12:24:09 2022 +0800

    Merge remote-tracking branch 'origin/master' into jenkins-disable-integration

 docs/Development/ContributeGuide.md                        | 14 +++++++++++++-
 grafana-plugin/backend-compile.sh                          |  4 ++--
 integration-test/import-control.xml                        |  1 +
 integration-test/pom.xml                                   |  5 +++++
 .../test/java/org/apache/iotdb/db/it/sync/IoTDBPipeIT.java | 14 ++++++++++++++
 library-udf/src/assembly/tools/register-UDF.bat            |  1 -
 library-udf/src/assembly/tools/register-UDF.sh             |  1 -
 7 files changed, 35 insertions(+), 5 deletions(-)