Skip to content

Mass backport into 8.x branch#2812

Merged
seanstory merged 9 commits into8.xfrom
main
Sep 10, 2024
Merged

Mass backport into 8.x branch#2812
seanstory merged 9 commits into8.xfrom
main

Conversation

@seanstory
Copy link
Member

Main is still on 8.16, as #2800 has not yet been able to build. But DRAs for 8.16 are being built now from 8.x branches, not main branches. We need to backport everything.

I'm going to mass-backport this, then set up main to auto-backport to 8.x until we can merge the 9.0 version bump PR.

elastic-renovate-prod bot and others added 9 commits September 4, 2024 20:31
…b8 (#2799)

Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>
…98 (#2801)

Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>
…41 (#2802)

Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>
Co-authored-by: Artem Shelkovnikov <artem.shelkovnikov@elastic.co>
…46 (#2805)

Co-authored-by: elastic-renovate-prod[bot] <174716857+elastic-renovate-prod[bot]@users.noreply.github.com>
@seanstory seanstory requested a review from a team September 10, 2024 14:14
Copy link
Contributor

@jedrazb jedrazb left a comment

Choose a reason for hiding this comment

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

You just rebased on main rather than backporting manually right?

@seanstory seanstory enabled auto-merge (squash) September 10, 2024 14:23
@seanstory
Copy link
Member Author

You just rebased on main rather than backporting manually right?

I went to the "pull requests" tab, and compared main going into 8.x and then clicked "create PR" 😅
Seemed easier

@artem-shelkovnikov
Copy link
Member

We'll lose some history, unfortunately, but might not be too important

@seanstory seanstory merged commit 845877a into 8.x Sep 10, 2024
@seanstory
Copy link
Member Author

We shouldn't have lost any history. All the commits should still be there, and still link to their PRs. Right?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants