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.

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

Backport v20.0.1 #1120

Closed
wants to merge 4 commits into from
Closed

Backport v20.0.1 #1120

wants to merge 4 commits into from

Conversation

sreuland
Copy link
Contributor

What

back port the v20.0.1 to main

Why

the gh bot pr to do the same backport has fallen behind main and would have a conflict - #1119 , doing it here as a rebase on top of latest main instead.

Known limitations

stellarsaur and others added 3 commits December 11, 2023 09:42
(cherry picked from commit 5571538)
(cherry picked from commit 3afe4db)
(cherry picked from commit 214a0df)
(cherry picked from commit 9b3796b)
@sreuland sreuland mentioned this pull request Dec 11, 2023
Copy link
Contributor

@mollykarcher mollykarcher left a comment

Choose a reason for hiding this comment

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

I don't see the conflict you're referencing with #1119, but also don't see an issue with merging this one instead of that one

@sreuland
Copy link
Contributor Author

ok, I'll merge, I saw conflict on cargo.lock when I rebased main locally and assumed that would have popped up when merging main into release/v20.0.1, but didn't verify that

@sreuland
Copy link
Contributor Author

will redo this version bump back to main based on 20.0.2

@sreuland sreuland closed this Dec 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants