Resolving conflicts

2025-10-23 22:56:51 +07:00
parent 2fccb3f4c4 53a5d1a7e4
commit 152a5476f7
44 changed files with 180 additions and 380 deletions
@@ -1,6 +1,25 @@
 # Change Log
 All notable changes to this project will be documented in this file.

+## [5.0.0]
+
+### Added
+
+- None
+
+### Changed
+
+- Wazuh server clean-up ([#2030](https://github.com/wazuh/wazuh-puppet/issues/2030))
+- Fix OpenSearch deprecated settings ([#1366](https://github.com/wazuh/wazuh-puppet/issues/1366))
+
+### Fixed
+
+- None
+
+### Deleted
+
+- None
+
 ## [4.14.1]

 ### Added