Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 4.7.1 into 4.8.0 #2548

Merged
merged 22 commits into from
Oct 24, 2023
Merged

Merge 4.7.1 into 4.8.0 #2548

merged 22 commits into from
Oct 24, 2023

Conversation

TomasTurina
Copy link
Member

Related issue
#2541

This PR aims merge branch 4.7.1 into 4.8.0.

JcabreraC and others added 20 commits October 11, 2023 11:03
Removed negation from the reference condition
Fix 4.5.4 changelog and include bump script in branch 4.5.4
Update version file and add function to bump_version script
Co-authored-by: Juan Nicolas Asselle <[email protected]>
@vikman90 vikman90 requested a review from JcabreraC October 24, 2023 08:45
Copy link
Member

@JcabreraC JcabreraC left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM !
The dates in 4.6.0 are not right.

@vikman90 vikman90 merged commit 9a03238 into 4.8.0 Oct 24, 2023
@vikman90 vikman90 deleted the merge-4.7.1-into-4.8.0 branch October 24, 2023 09:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Scheduled upward merges for numbered branches in wazuh-packages repository - Fortnight #20
7 participants