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

avoid tight coupling between Omicron and Propolis Dropshot versions #7057

Merged
merged 7 commits into from
Nov 14, 2024

Conversation

davepacheco
Copy link
Collaborator

@davepacheco davepacheco commented Nov 13, 2024

Fixes #3361.

Depends on oxidecomputer/propolis#808 and #7061.

@davepacheco
Copy link
Collaborator Author

Besides working on its own, I've tested that this seems to solve the problem by merging the tip of this branch (3da800b) into the tip of #7050 (294caf7), where I first ran into this. Previously, cargo check --all-targets -p omicron-sled-agent had failed with the error reported in #3361. Now it succeeds.

@davepacheco davepacheco changed the base branch from main to dap/propolis-update November 13, 2024 21:09
@davepacheco davepacheco marked this pull request as ready for review November 13, 2024 21:10
Base automatically changed from dap/propolis-update to main November 14, 2024 00:26
@davepacheco davepacheco merged commit 59ab88a into main Nov 14, 2024
18 checks passed
@davepacheco davepacheco deleted the dap/fix-dropshot-coupling branch November 14, 2024 00:36
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.

sim-sled-agent mixes omicron's dropshot dependency with propolis's dropshot dependency
2 participants