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.

Sign up for GitHub

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

Jump to bottom

Merge 4.9.0 into master #1025

Merged
merged 30 commits into from
May 31, 2024
Merged

Merge 4.9.0 into master #1025

merged 30 commits into from
May 31, 2024

Conversation

vcerenu
Copy link
Member

@vcerenu vcerenu commented May 31, 2024

Related issue #1022

Enaraque and others added 30 commits May 3, 2024 10:06
@Enaraque
Bump revision
3f8d00d
@vcerenu
Merge pull request #996 from wazuh/bump-revision-4.8.0
f10ccf8 
Bump revision
@vcerenu
change deploy manifest and change template test
60fc1e3
@vcerenu
add ossec_service_provider value
06be421
@vcerenu
delete comma
c710b9d
@vcerenu
delete wodle_openscap_content variable
8ec1ab5
@vcerenu
delete comment
35ef905
@teddytpc1
Merge pull request #1000 from wazuh/23321-agent-al2023
0e6f3e1 
Service provider for Amazon Linux
@Enaraque
Add bump revision
97c96c3
@davidcr01
Merge pull request #1002 from wazuh/bump-revision-480
2e7f368 
Add bump revision to 4.8.0
@CarlosALgit
bump 4.7.5 version
852ae46
@teddytpc1
Merge pull request #1005 from wazuh/bump-4.7.5
0812328 
Bump to 4.7.5
@vcerenu
change deployment manifest build
d7b293d
@vcerenu
change deployment manifest build
dbbf505
@teddytpc1
Merge pull request #998 from wazuh/931-change-manifest-test
0f6eb69 
Fix Github Actions Tests
@c-bordon
Merge branch '4.8.0' into merge-4.7.5-into-4.8.0
7088846
@teddytpc1
Merge pull request #1009 from wazuh/merge-4.7.5-into-4.8.0
5a3d962 
Merge 4.7.5 into 4.8.0
@teddytpc1
Bump revision
ee88d15
@c-bordon
Merge pull request #1010 from wazuh/1007-bump-revision
59a3d25 
Bump revision
@teddytpc1
Merge branch '4.8.0' into merge-4.7.5-into-4.8.0
73ff857
@c-bordon
Merge pull request #1011 from wazuh/merge-4.7.5-into-4.8.0
14b500b 
Merge 4.7.5 into 4.8.0
@Enaraque
Bump 4.8.0 revision
608932d
@davidcr01
Merge pull request #1013 from wazuh/1012-bump-revision
d874123
@vcerenu
bump revision
f845019
@c-bordon
Merge pull request #1017 from wazuh/1016-bump-revision
4dde522 
Bump revision rc2
@vcerenu
merge 4.7.5 into 4.8.0
7db85de
@teddytpc1
Merge pull request #1023 from wazuh/merge-4.7.5-into-4.8.0
ee12092 
Merge 4.7.5 into 4.8.0
@vcerenu
merge 4.8.0 into 4.9.0
8784207
@teddytpc1
Merge pull request #1024 from wazuh/1022-merge-4.8.0-into-4.9.0
a3fe6e4 
Merge 4.8.0 into 4.9.0
@vcerenu
Merge branch 'master' of github.com:wazuh/wazuh-puppet into 4.9.0
e267021
@vcerenu vcerenu requested a review from a team May 31, 2024 15:03
@vcerenu vcerenu self-assigned this May 31, 2024
@vcerenu vcerenu mentioned this pull request May 31, 2024
Closed
6 tasks
@vcerenu vcerenu linked an issue May 31, 2024 that may be closed by this pull request
Post release tasks for 4.7.5 #1022
Closed
6 tasks
@teddytpc1 teddytpc1 merged commit a604de2 into master May 31, 2024
3 of 5 checks passed
@teddytpc1 teddytpc1 deleted the 1022-merge-4.9.0-into-master branch May 31, 2024 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@teddytpc1 teddytpc1 teddytpc1 approved these changes

Assignees

@vcerenu vcerenu

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Post release tasks for 4.7.5
6 participants
@vcerenu @teddytpc1 @Enaraque @davidcr01 @CarlosALgit @c-bordon