This is an automated email from the ASF dual-hosted git repository. zhaoqingran pushed a commit to branch release-1.6.1-rc1 in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit b802514efd2f93260804cdca2fd9bb1032ac8661 Merge: e5fafdbc0 febc91163 Author: Logic <[email protected]> AuthorDate: Thu Sep 19 16:10:20 2024 +0800 Merge branch 'master' of github.com:apache/hertzbeat into release-1.6.1-rc1 # Conflicts: # script/release/release-win.ps1 script/assembly/collector/assembly-linux-amd64.xml | 2 +- script/assembly/collector/assembly-linux-arm64.xml | 2 +- script/assembly/collector/assembly-macos-amd64.xml | 2 +- script/assembly/collector/assembly-macos-arm64.xml | 2 +- script/assembly/collector/assembly-windows-64.xml | 2 +- script/assembly/collector/assembly.xml | 2 +- script/assembly/collector/bin/entrypoint.sh | 8 +++++--- script/assembly/collector/bin/restart.sh | 13 +++++++++++-- script/assembly/collector/bin/shutdown.bat | 6 +++--- script/assembly/collector/bin/shutdown.sh | 4 ++-- script/assembly/collector/bin/startup.bat | 8 +++++--- script/assembly/collector/bin/startup.sh | 8 +++++--- script/assembly/server/assembly-linux-amd64.xml | 2 +- script/assembly/server/assembly-linux-arm64.xml | 2 +- script/assembly/server/assembly-macos-amd64.xml | 2 +- script/assembly/server/assembly-macos-arm64.xml | 2 +- script/assembly/server/assembly-windows-64.xml | 2 +- script/assembly/server/assembly.xml | 2 +- script/assembly/server/bin/entrypoint.sh | 8 +++++--- script/assembly/server/bin/restart.sh | 13 +++++++++++-- script/assembly/server/bin/shutdown.bat | 6 +++--- script/assembly/server/bin/shutdown.sh | 4 ++-- script/assembly/server/bin/startup.bat | 8 +++++--- script/assembly/server/bin/startup.sh | 8 +++++--- script/release/release-win.ps1 | 17 ++++++++++++++++- 25 files changed, 90 insertions(+), 45 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
