Scheduled upward merges for numbered branches in wazuh-indexer repository - Fortnight #7 - Githubissues

wazuh / wazuh-indexer

Wazuh indexer, the Wazuh search engine

https://opensearch.org/docs/latest/opensearch/index/

Apache License 2.0

11 stars 17 forks source link

Scheduled upward merges for numbered branches in wazuh-indexer repository - Fortnight #7 #195

Closed davidjiglesias closed 6 months ago

davidjiglesias commented 6 months ago

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.8.0-into-4.8.1.

Tasks

4.8.0

~~Update changelog.~~
~~Merge branch 4.8.0 into branch 4.8.1.~~

4.8.1
~~Update changelog.~~
~~Merge branch 4.8.1 into branch 4.8.2.~~

4.8.2
~~Update changelog.~~
~~Merge branch 4.8.2 into branch 4.9.0.~~

4.9.0
~~Update changelog.~~
[x] Merge branch 4.9.0 into branch master.

5.0.0 (master)
[x] Update changelog.

AlexRuiz7 commented 6 months ago

Forks work different and merge is not possible due to unrelated Git histories. We need to regenerate (overwrite) the master branch from the 4.9.0 branch. Only @gdiazlo is allowed to perform such changes.