Skip to content

Commit 83932a0

Browse files
author
Alan Hanson
committed
Update Crucible and Propolis to latest
Crucible: Add quota to agent created datasets (#835) Switch to building on heliosv2 (#830) Minor clippy cleanup (#832) Update to latest dropshot (#829) Propolis: The above crucible changes Switch to building on heliosv2 (#461) clean up cargo check/clippy errors when built with Rust 1.71 (#462) Add some VMM_DESTROY_VM polish to bhyve-api
1 parent 76d51d8 commit 83932a0

File tree

3 files changed

+30
-41
lines changed

3 files changed

+30
-41
lines changed

Cargo.lock

Lines changed: 16 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@ cookie = "0.16"
151151
criterion = { version = "0.5.1", features = [ "async_tokio" ] }
152152
crossbeam = "0.8"
153153
crossterm = { version = "0.26.1", features = ["event-stream"] }
154-
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "c574ff1232aa66eb60069795fe45f0c47f5da51d" }
155-
crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "c574ff1232aa66eb60069795fe45f0c47f5da51d" }
156-
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "c574ff1232aa66eb60069795fe45f0c47f5da51d" }
157-
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "c574ff1232aa66eb60069795fe45f0c47f5da51d" }
154+
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "179e68b8718d24673893dac46a8ab4a9249ec318" }
155+
crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "179e68b8718d24673893dac46a8ab4a9249ec318" }
156+
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "179e68b8718d24673893dac46a8ab4a9249ec318" }
157+
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "179e68b8718d24673893dac46a8ab4a9249ec318" }
158158
curve25519-dalek = "3"
159159
datatest-stable = "0.1.3"
160160
display-error-chain = "0.1.1"
@@ -264,9 +264,9 @@ pretty-hex = "0.3.0"
264264
proc-macro2 = "1.0"
265265
progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
266266
progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
267-
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "9e12522341048d7b8c38394f0ddeb18083685c2f" }
268-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "9e12522341048d7b8c38394f0ddeb18083685c2f", features = [ "generated-migration" ] }
269-
propolis-server = { git = "https://github.com/oxidecomputer/propolis", rev = "9e12522341048d7b8c38394f0ddeb18083685c2f", default-features = false, features = ["mock-only"] }
267+
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "eeb63abee5a84da54bebed061a87fafbd66c1f12" }
268+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "eeb63abee5a84da54bebed061a87fafbd66c1f12", features = [ "generated-migration" ] }
269+
propolis-server = { git = "https://github.com/oxidecomputer/propolis", rev = "eeb63abee5a84da54bebed061a87fafbd66c1f12", default-features = false, features = ["mock-only"] }
270270
#propolis-server = { path = "../propolis/bin/propolis-server" }
271271
proptest = "1.2.0"
272272
quote = "1.0"
@@ -515,6 +515,7 @@ opt-level = 3
515515
#crucible-agent-client = { path = "../crucible/agent-client" }
516516
#crucible-client-types = { path = "../crucible/crucible-client-types" }
517517
#crucible-pantry-client = { path = "../crucible/pantry-client" }
518+
#crucible-smf = { path = "../crucible/smf" }
518519

519520
#
520521
# Local client generation during development.

package-manifest.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -242,21 +242,21 @@ only_for_targets.image = "standard"
242242
# 3. Use source.type = "manual" instead of "prebuilt"
243243
source.type = "prebuilt"
244244
source.repo = "crucible"
245-
source.commit = "c574ff1232aa66eb60069795fe45f0c47f5da51d"
245+
source.commit = "179e68b8718d24673893dac46a8ab4a9249ec318"
246246
# The SHA256 digest is automatically posted to:
247247
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
248-
source.sha256 = "72363fbbfde15689bdbafee53e415ca994903644a9fdbb33ca0bc72d65927f0f"
248+
source.sha256 = "92d83450a48c3bca7775a8b00b453dfb48d1c6a3519bc1a4a75c9f9c46543e8f"
249249
output.type = "zone"
250250

251251
[package.crucible-pantry]
252252
service_name = "crucible_pantry"
253253
only_for_targets.image = "standard"
254254
source.type = "prebuilt"
255255
source.repo = "crucible"
256-
source.commit = "c574ff1232aa66eb60069795fe45f0c47f5da51d"
256+
source.commit = "179e68b8718d24673893dac46a8ab4a9249ec318"
257257
# The SHA256 digest is automatically posted to:
258258
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
259-
source.sha256 = "4645454e3af72ee68bc3916042f78deaac44a8c07bb6c1a1e5766b83f5326e07"
259+
source.sha256 = "88d86e90f1c0e45eb371b57ecf05f15ac869d642adf343b76217bb2cdb7a928d"
260260
output.type = "zone"
261261

262262
# Refer to
@@ -267,10 +267,10 @@ service_name = "propolis-server"
267267
only_for_targets.image = "standard"
268268
source.type = "prebuilt"
269269
source.repo = "propolis"
270-
source.commit = "9e12522341048d7b8c38394f0ddeb18083685c2f"
270+
source.commit = "eeb63abee5a84da54bebed061a87fafbd66c1f12"
271271
# The SHA256 digest is automatically posted to:
272272
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
273-
source.sha256 = "084df2cf5866a17b5467dccdaddef5088cc021a1ee0eb3bea99472bcf67ea7fa"
273+
source.sha256 = "866be7208bfd4a235d1babd28e346bbc0164d5922bdc108ded32841ac8cbfe27"
274274
output.type = "zone"
275275

276276
[package.maghemite]

0 commit comments

Comments
 (0)