From d39bb90b888d7230883dd7470c4bed2c8a4d3c68 Mon Sep 17 00:00:00 2001 From: Antonio <34042064+Desvelao@users.noreply.github.com> Date: Mon, 28 Oct 2024 15:36:43 +0100 Subject: [PATCH 1/2] Bump 4.9.2 rev01 (#382) --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3ab8bed0b79..77690b2d1526 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,12 @@ All notable changes to the Wazuh app project will be documented in this file. - Changed the order of the “Dashboard management” and “Indexer management” sections. +## Wazuh dashboard v4.9.2 - OpenSearch Dashboards 2.13.0 - Revision 01 + +### Added + +- Support for Wazuh 4.9.1 + ## Wazuh dashboard v4.9.1 - OpenSearch Dashboards 2.13.0 - Revision 04 ### Added diff --git a/package.json b/package.json index 16ae5221b21c..05af8764cee6 100644 --- a/package.json +++ b/package.json @@ -506,4 +506,4 @@ "node": ">=14.20.1 <19", "yarn": "^1.22.10" } -} +} \ No newline at end of file From b6912db8eec54ca23a43b8777a5437bfd3a21875 Mon Sep 17 00:00:00 2001 From: Nicolas Agustin Guevara Pihen Date: Tue, 5 Nov 2024 06:39:09 -0300 Subject: [PATCH 2/2] Fix typo in conflict solving --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77690b2d1526..47ab68322e09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,7 @@ All notable changes to the Wazuh app project will be documented in this file. ### Added -- Support for Wazuh 4.9.1 +- Support for Wazuh 4.9.2 ## Wazuh dashboard v4.9.1 - OpenSearch Dashboards 2.13.0 - Revision 04