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

Scheduled upward merges for numbered branches in wazuh-puppet repository - Fortnight #3 #1234

Closed
5 tasks done
wazuhci opened this issue Feb 4, 2025 · 1 comment · Fixed by #1235, #1236 or #1237
Closed
5 tasks done

Scheduled upward merges for numbered branches in wazuh-puppet repository - Fortnight #3 #1234

wazuhci opened this issue Feb 4, 2025 · 1 comment · Fixed by #1235, #1236 or #1237
Assignees
@vcerenu
Labels
level/subtask Subtask issue request/operational Operational requests type/maintenance Maintenance issue

Comments

@wazuhci
Copy link

wazuhci commented Feb 4, 2025 •
edited by vcerenu
Loading

Description

The goal is to complete the following tasks, each task must have a PR associated with this issue.

The branches must follow the naming: merge-<ORIGIN_BRANCH>-into-<DESTINATION_BRANCH>. For example, merge-4.10.2-into-4.11.0.

Tasks

4.10.2

  • Update changelog.
  • Merge branch 4.10.2 into branch 4.11.0.

4.11.0

  • Remove 4.10.2 references from branch 4.11.0.
  • Update changelog.
  • Merge branch 4.11.0 into branch 4.12.0.
@wazuhci wazuhci added level/subtask Subtask issue request/operational Operational requests type/maintenance Maintenance issue labels Feb 4, 2025
@wazuhci wazuhci mentioned this issue Feb 4, 2025
Closed
3 tasks
@vcerenu vcerenu mentioned this issue Feb 4, 2025
Merged
@vcerenu vcerenu linked a pull request Feb 4, 2025 that will close this issue
Merge 4.10.2 into 4.11.0 #1235
Merged
@vcerenu vcerenu mentioned this issue Feb 4, 2025
Merged
@vcerenu vcerenu linked a pull request Feb 4, 2025 that will close this issue
Detele 4.10.2 references #1236
Merged
@vcerenu vcerenu mentioned this issue Feb 4, 2025
Merged
@vcerenu vcerenu linked a pull request Feb 4, 2025 that will close this issue
Merge 4.11.0 into 4.12.0 #1237
Merged
@c-bordon
Copy link
Member

c-bordon commented Feb 4, 2025

LGTM

@c-bordon c-bordon closed this as completed Feb 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@vcerenu vcerenu

Labels
level/subtask Subtask issue request/operational Operational requests type/maintenance Maintenance issue
Projects
None yet
Milestone
No milestone
3 participants
@wazuhci @vcerenu @c-bordon