[iotdb] 01/01: fix conflict

[ma...@apache.org]

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

marklau99 pushed a commit to branch merge-with-rc/0.13.4
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 70859bb8c15d413e6a6867e5154dc0ffe5b564a3
Merge: 75eaadccdf a9368ccc8d
Author: LiuXuxin <li...@outlook.com>
AuthorDate: Sat Mar 11 17:32:46 2023 +0800

    fix conflict

 RELEASE_NOTES.md                   | 15 +++------------
 antlr/pom.xml                      |  2 +-
 cli/pom.xml                        |  2 +-
 client-cpp/pom.xml                 |  6 +++---
 client-py/pom.xml                  |  2 +-
 client-py/setup.py                 |  2 +-
 cluster/pom.xml                    |  2 +-
 code-coverage/pom.xml              |  2 +-
 compile-tools/pom.xml              |  8 ++++----
 compile-tools/thrift/pom.xml       |  2 +-
 cross-tests/pom.xml                |  2 +-
 distribution/pom.xml               |  4 ++--
 example/client-cpp-example/pom.xml |  4 ++--
 example/flink/pom.xml              |  2 +-
 example/hadoop/pom.xml             |  2 +-
 example/jdbc/pom.xml               |  2 +-
 example/kafka/pom.xml              |  2 +-
 example/mqtt-customize/pom.xml     |  2 +-
 example/mqtt/pom.xml               |  2 +-
 example/pom.xml                    |  2 +-
 example/pulsar/pom.xml             |  2 +-
 example/rabbitmq/pom.xml           |  2 +-
 example/rocketmq/pom.xml           |  2 +-
 example/session/pom.xml            |  2 +-
 example/trigger/pom.xml            |  6 +++---
 example/tsfile/pom.xml             |  2 +-
 example/udf/pom.xml                |  4 ++--
 external-api/pom.xml               |  2 +-
 flink-iotdb-connector/pom.xml      |  2 +-
 flink-tsfile-connector/pom.xml     |  2 +-
 grafana-connector/pom.xml          |  4 ++--
 grafana-plugin/pom.xml             | 10 +++++-----
 hadoop/pom.xml                     |  2 +-
 hive-connector/pom.xml             |  2 +-
 integration/pom.xml                |  8 ++++----
 isession/pom.xml                   |  2 +-
 jdbc/pom.xml                       |  4 ++--
 jdbc/src/main/feature/feature.xml  |  2 +-
 metrics/dropwizard-metrics/pom.xml |  4 ++--
 metrics/interface/pom.xml          |  4 ++--
 metrics/micrometer-metrics/pom.xml |  4 ++--
 metrics/pom.xml                    |  2 +-
 openapi/pom.xml                    |  2 +-
 pom.xml                            | 12 ++++++------
 rewriteFileTool/pom.xml            |  2 +-
 server/pom.xml                     |  2 +-
 service-rpc/pom.xml                |  2 +-
 session/pom.xml                    |  2 +-
 site/pom.xml                       |  2 +-
 spark-iotdb-connector/pom.xml      |  2 +-
 spark-tsfile/pom.xml               |  2 +-
 thrift-cluster/pom.xml             |  2 +-
 thrift-influxdb/pom.xml            |  2 +-
 thrift-sync/pom.xml                |  2 +-
 thrift/pom.xml                     |  2 +-
 tsfile/pom.xml                     |  2 +-
 zeppelin-interpreter/pom.xml       |  2 +-
 57 files changed, 86 insertions(+), 95 deletions(-)