Skip to content

Commit 7f1da07

Browse files
yenienserranoRipdiegozzwazuhci
authored
Merge 4.14.8 into 5.0.0 (#1474)
* Change bumper_repository workflows merge type (#1463) * fix: use squash merge strategy in bumper repository workflow Change gh pr merge from --merge to --squash in 4_bumper_repository.yml so bump PRs land as a single squashed commit, consistent with this repo's squash-merge convention for single-purpose PRs. Related to #1459 Signed-off-by: Diego Garcia <diego.garcia@wazuh.com> * fix: correct inverted changelog dates in wazuh-dashboard.spec The 4.14.8 and 4.10.5 changelog entries had inverted dates (4.14.8 dated before 4.10.5, breaking the otherwise strictly-descending order). Swap the two dates so 4.14.8 correctly sits above 4.10.5 chronologically. Signed-off-by: Diego Garcia <diego.garcia@wazuh.com> * fix: reorder changelog entries instead of altering their dates The previous commit incorrectly swapped the 4.14.8 and 4.10.5 entries' dates to fix the ordering. That falsifies each entry's actual release date. Instead, reorder the two entries (move 4.10.5, dated later, above 4.14.8) so the changelog restores descending order while keeping each entry's real date unchanged. Signed-off-by: Diego Garcia <diego.garcia@wazuh.com> --------- Signed-off-by: Diego Garcia <diego.garcia@wazuh.com> * Merge 4.14.7 into 4.14.8 (#1473) feat: bump 4.14.7 Co-authored-by: wazuhci <22834044+wazuhci@users.noreply.github.com> --------- Signed-off-by: Diego Garcia <diego.garcia@wazuh.com> Co-authored-by: Diego García <82405377+Ripdiegozz@users.noreply.github.com> Co-authored-by: wazuhci <22834044+wazuhci@users.noreply.github.com>
1 parent 16765ba commit 7f1da07

0 file changed

File tree

    0 commit comments

    Comments
     (0)