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

revert merge of 4966 to release/v80 #4968

Merged
merged 1 commit into from
Dec 16, 2024
Merged

Conversation

conorsch
Copy link
Contributor

Describe your changes

The PR #4966 was mistakenly targeted against release/v0.80.x, which branch has fallen out of sync with main. If we want to make a Penumbra point release, PRs should target main, and we'll tag directly on main.

Eventually we may want to revive release/v0.80.x and use it for backports, but that time is not now. By reverting the out-f-order merge from #4966, we leave the door open to updating that branch in the future so it can be used to manage backports.

Issue ticket number and link

Just #4966 is relevant.

Checklist before requesting a review

  • I have added guiding text to explain how a reviewer should test these changes.

  • If this code contains consensus-breaking changes, I have added the "consensus-breaking" label. Otherwise, I declare my belief that there are not consensus-breaking changes, for the following reason:

    this is a housekeeping commit, intended to cleanup git history and avoid confusion.

@conorsch conorsch merged commit 884c987 into release/v0.80.x Dec 16, 2024
11 checks passed
@conorsch conorsch deleted the revert-merge-of-4966 branch December 16, 2024 21:47
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.

2 participants