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

remove patch.crates-io.zone #6484

Merged
merged 1 commit into from
Aug 30, 2024
Merged

remove patch.crates-io.zone #6484

merged 1 commit into from
Aug 30, 2024

Conversation

iliana
Copy link
Contributor

@iliana iliana commented Aug 29, 2024

While looking at doing lockfile maintenance for R11 I noticed that we patch the zone package to be a branch that adds Eq and Hash to zone::State. This branch was never merged into the main branch of oxidecomputer/zone, and also appears to be unnecessary for Omicron to build at present. This switches us back to the released version on crates.io.

@iliana iliana added the dependencies Pull requests that update a dependency file label Aug 29, 2024
@iliana iliana merged commit d36f3a5 into main Aug 30, 2024
24 checks passed
@iliana iliana deleted the iliana/unpatch-zone branch August 30, 2024 03:47
hawkw pushed a commit that referenced this pull request Aug 31, 2024
While looking at doing lockfile maintenance for R11 I noticed that we
patch the `zone` package to be a branch that adds Eq and Hash to
`zone::State`. This branch was never merged into the main branch of
oxidecomputer/zone, and also appears to be unnecessary for Omicron to
build at present. This switches us back to the released version on
crates.io.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants