Merge 4.6.0 into 4.7.0 (#4637)

* Merge 4.5.4 into 4.6.0 (#4636) * 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 <[email protected]> Co-authored-by: Víctor Rebollo Pérez <[email protected]> * Added missing version --------- Co-authored-by: Julia <[email protected]> Co-authored-by: Víctor Rebollo Pérez <[email protected]>
wazuh · Oct 20, 2023 · 227e018 · 227e018
1 parent 1d5f7a2
commit 227e018
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -91,6 +91,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
@@ -193,7 +193,9 @@ predefined_values:
     - 4.5.1
     - 4.5.2
     - 4.5.3
+    - 4.5.4
     - 4.6.0
+    - 4.7.0
   tags:
     - active_response
     - agentd
-Original file line number
+Diff line change
@@ Expand Up / @@ -193,7 +193,9 @@ predefined_values: @@
         - 4.5.1
         - 4.5.2
         - 4.5.3
+        - 4.5.4
         - 4.6.0
+        - 4.7.0
       tags:
         - active_response
         - agentd
@@ Expand Down @@