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.7.2 into 4.8.0 #2715

Merged
merged 13 commits into from
Dec 22, 2023
Merged

Merge 4.7.2 into 4.8.0 #2715

merged 13 commits into from
Dec 22, 2023

Conversation

MarcelKemp
Copy link
Member

Related issue
#2704

This PR aims to merge branch 4.7.2 into 4.8.0.

Dwordcito and others added 13 commits December 7, 2023 15:59
@Dwordcito
Update release ETA for 4.7.1
a634bd6
@Dwordcito
Merge pull request #2672 from wazuh/operational/2671-change-eta
c6610cf 
Update release ETA for 4.7.1
@davidcr01
Fixed source branch value
ac5ed67
@teddytpc1
Merge pull request #2675 from wazuh/bug/fix-source-branch-4.7.1
ab7ec2e 
Fixed source branch value
@davidcr01
Removed gnupg from RPM dependency list
721cabf
@teddytpc1
Merge pull request #2677 from wazuh/enhancement/2663-investigate-if-g…
88773a9 
…pg-gnupg-package-is-necessary-as-dependency-in-wia

Removed `gnupg` package as RPM dependency in WIA
@mjcr99
Added Debian12 SCA to SPECS
ec50d63
@vikman90
Merge pull request #2693 from wazuh/enhancement/2280-specs-for-new-sc…
340abef 
…a-debian-linux-12

Add Debian12 SCA to SPECS
@davidcr01
Fixed source_branch variable definition
2c8724f
@teddytpc1
Merge pull request #2708 from wazuh/bug/2702-the-git-package-should-n…
ad35e08 
…ot-be-a-dependency-to-build-the-wazuh-unattended-scripts

Fixed `source_branch` variable definition
@MarcelKemp
Merge branch '4.7.1' into merge-4.7.1-into-4.7.2
5028538
@vikman90
Merge pull request #2714 from wazuh/merge-4.7.1-into-4.7.2
63271de 
Merge 4.7.1 into 4.7.2
@MarcelKemp
Merge branch '4.7.2' into merge-4.7.2-into-4.8.0
204af29
@MarcelKemp MarcelKemp self-assigned this Dec 21, 2023
@MarcelKemp MarcelKemp changed the base branch from master to 4.8.0 December 21, 2023 11:30
@MarcelKemp MarcelKemp mentioned this pull request Dec 21, 2023
Closed
8 tasks
@MarcelKemp
Copy link
Member Author

Failed checks will be worked on in the following issues:

@pereyra-m
Copy link
Member

pereyra-m commented Dec 22, 2023 •
edited
Loading

There are some failing checks related to All In One and Distributed Cases.
They will be solved in another issue #2717

@pereyra-m pereyra-m mentioned this pull request Dec 22, 2023
Closed
2 tasks
@Dwordcito Dwordcito merged commit 233ca6f into 4.8.0 Dec 22, 2023
51 of 58 checks passed
@Dwordcito Dwordcito deleted the merge-4.7.2-into-4.8.0 branch December 22, 2023 03:07
@MarcelKemp MarcelKemp linked an issue Dec 26, 2023 that may be closed by this pull request
Post release tasks for 4.7.1 #2704
Closed
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pereyra-m pereyra-m pereyra-m approved these changes

@vikman90 vikman90 Awaiting requested review from vikman90

Assignees

@MarcelKemp MarcelKemp

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.1
7 participants
@MarcelKemp @pereyra-m @Dwordcito @davidcr01 @teddytpc1 @mjcr99 @vikman90