Skip to content

Commit

Permalink
Pin qorb's revision (#6876)
Browse files Browse the repository at this point in the history
I'd like to integrate oxidecomputer/qorb#45 into
qorb, and then omicron, but I want to be able to control that revision
explicitly.

Before I do that, pin the revision of qorb we're using so that "merging
something into qorb" doesn't break omicron.
  • Loading branch information
smklein authored Oct 15, 2024
1 parent 9ea5002 commit 7f90954
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
6 changes: 4 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ derive_more = "0.99.18"
derive-where = "1.2.7"
# Having the i-implement-... feature here makes diesel go away from the workspace-hack
diesel = { version = "2.2.4", features = ["i-implement-a-third-party-backend-and-opt-into-breaking-changes", "postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
diesel-dtrace = { git = "https://github.com/oxidecomputer/diesel-dtrace", branch = "main" }
diesel-dtrace = "0.3.0"
dns-server = { path = "dns-server" }
dns-server-api = { path = "dns-server-api" }
dns-service-client = { path = "clients/dns-service-client" }
Expand Down Expand Up @@ -520,7 +520,7 @@ propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev =
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "11371b0f3743f8df5b047dc0edc2699f4bdf3927" }
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "11371b0f3743f8df5b047dc0edc2699f4bdf3927" }
proptest = "1.5.0"
qorb = { git = "https://github.com/oxidecomputer/qorb", branch = "master" }
qorb = "0.0.2"
quote = "1.0"
rand = "0.8.5"
rand_core = "0.6.4"
Expand Down
4 changes: 2 additions & 2 deletions workspace-hack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ pkcs8 = { version = "0.10.2", default-features = false, features = ["encryption"
postgres-types = { version = "0.2.8", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
predicates = { version = "3.1.2" }
proc-macro2 = { version = "1.0.87" }
qorb = { git = "https://github.com/oxidecomputer/qorb", branch = "master", features = ["qtop"] }
qorb = { version = "0.0.2", features = ["qtop"] }
quote = { version = "1.0.37" }
rand = { version = "0.8.5", features = ["small_rng"] }
regex = { version = "1.11.0" }
Expand Down Expand Up @@ -206,7 +206,7 @@ pkcs8 = { version = "0.10.2", default-features = false, features = ["encryption"
postgres-types = { version = "0.2.8", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
predicates = { version = "3.1.2" }
proc-macro2 = { version = "1.0.87" }
qorb = { git = "https://github.com/oxidecomputer/qorb", branch = "master", features = ["qtop"] }
qorb = { version = "0.0.2", features = ["qtop"] }
quote = { version = "1.0.37" }
rand = { version = "0.8.5", features = ["small_rng"] }
regex = { version = "1.11.0" }
Expand Down

0 comments on commit 7f90954

Please sign in to comment.