From 4f62eb7b2b392375b36e910ba5423c56036b81ae Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Fri, 20 Oct 2023 19:16:22 +0200 Subject: [PATCH] Merge 4.5.4 into 4.6.0 (#4636) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: bump version * docs: update 4.5.4 eta in changelog * feat: bump revision to 40510 * Added 4.5.4 changelog (#4635) --------- Co-authored-by: Julia Co-authored-by: Víctor Rebollo Pérez --- CHANGELOG.md | 5 +++++ deps/wazuh_testing/wazuh_testing/qa_docs/schema.yaml | 1 + 2 files changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fbea2601d9..9a3c641840 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -73,6 +73,11 @@ Release report: TBD - Fix bug in the framework on migration tool ([#4027](https://github.com/wazuh/wazuh-qa/pull/4027)) \- (Framework) - Fix test cluster / integrity sync system test and configuration to avoid flaky behavior ([#4406](https://github.com/wazuh/wazuh-qa/pull/4406)) \- (Tests) +## [4.5.4] - 24/10/2023 + +Wazuh commit: https://github.com/wazuh/wazuh/commit/48870c11207b1f0ba20ae29688d75564bfc04489 \ +Release report: https://github.com/wazuh/wazuh/issues/19764 + ## [4.5.3] - 10/10/2023 Wazuh commit: https://github.com/wazuh/wazuh/commit/388ce54b704d7b6aa2dda1b30258ad1642b26a2d \ diff --git a/deps/wazuh_testing/wazuh_testing/qa_docs/schema.yaml b/deps/wazuh_testing/wazuh_testing/qa_docs/schema.yaml index 2457fcd1d3..b6fbcdd5c5 100644 --- a/deps/wazuh_testing/wazuh_testing/qa_docs/schema.yaml +++ b/deps/wazuh_testing/wazuh_testing/qa_docs/schema.yaml @@ -192,6 +192,7 @@ predefined_values: - 4.5.1 - 4.5.2 - 4.5.3 + - 4.5.4 - 4.6.0 tags: - active_response