Skip to content

Conversation

@Calvin979
Copy link
Contributor

@Calvin979 Calvin979 commented Jun 23, 2025

What's changed?

Checklist

  • I have read the Contributing Guide
  • I have written the necessary doc or comment.
  • I have added the necessary unit tests and all cases have passed.

Add or update API

  • I have added the necessary e2e tests and all cases have passed.

@lynx009
Copy link
Contributor

lynx009 commented Jun 24, 2025

bf162b2165fdb16cce09e4779703c5af You can remove the first plugin above and keep the second one, which can solve the backend-build problem because these two plugins have duplicate declarations, which also occurs in the master branch.

PR: https://github.com/apache/hertzbeat/pull/3428/files#diff-576dba2886a119589f9f3dd47a8bf8ae2a93ba73148cbe7046d4f53d89911e5e

@Calvin979 Calvin979 requested a review from lynx009 June 28, 2025 01:33
Aias00 and others added 4 commits June 28, 2025 22:20
…sion

# Conflicts:
#	hertzbeat-manager/src/main/resources/define/app-almalinux.yml
#	hertzbeat-manager/src/main/resources/define/app-centos.yml
#	hertzbeat-manager/src/main/resources/define/app-cisco_switch.yml
#	hertzbeat-manager/src/main/resources/define/app-clickhouse.yml
#	hertzbeat-manager/src/main/resources/define/app-coreos.yml
#	hertzbeat-manager/src/main/resources/define/app-darwin.yml
#	hertzbeat-manager/src/main/resources/define/app-debian.yml
#	hertzbeat-manager/src/main/resources/define/app-dm.yml
#	hertzbeat-manager/src/main/resources/define/app-docker.yml
#	hertzbeat-manager/src/main/resources/define/app-doris_be.yml
#	hertzbeat-manager/src/main/resources/define/app-doris_fe.yml
#	hertzbeat-manager/src/main/resources/define/app-dynamic_tp.yml
#	hertzbeat-manager/src/main/resources/define/app-elasticsearch.yml
#	hertzbeat-manager/src/main/resources/define/app-emqx.yml
#	hertzbeat-manager/src/main/resources/define/app-euleros.yml
#	hertzbeat-manager/src/main/resources/define/app-flink.yml
#	hertzbeat-manager/src/main/resources/define/app-flink_on_yarn.yml
#	hertzbeat-manager/src/main/resources/define/app-freebsd.yml
#	hertzbeat-manager/src/main/resources/define/app-ftp.yml
#	hertzbeat-manager/src/main/resources/define/app-fullsite.yml
#	hertzbeat-manager/src/main/resources/define/app-greenplum.yml
#	hertzbeat-manager/src/main/resources/define/app-h3c_switch.yml
#	hertzbeat-manager/src/main/resources/define/app-hbase_master.yml
#	hertzbeat-manager/src/main/resources/define/app-hbase_regionserver.yml
#	hertzbeat-manager/src/main/resources/define/app-hdfs_datanode.yml
#	hertzbeat-manager/src/main/resources/define/app-hdfs_namenode.yml
#	hertzbeat-manager/src/main/resources/define/app-hertzbeat.yml
#	hertzbeat-manager/src/main/resources/define/app-hertzbeat_token.yml
Copy link
Contributor

@lynx009 lynx009 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀!

@lynx009 lynx009 merged commit 5fdb345 into master Jun 29, 2025
3 checks passed
@Calvin979 Calvin979 deleted the i18n_japanese_hikvision branch June 29, 2025 16:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants