From 500212c8104edd9ed0f8e21dbfea074defda0525 Mon Sep 17 00:00:00 2001 From: Zeeshan Lakhani Date: Thu, 29 Aug 2024 19:28:59 +0000 Subject: [PATCH] [deps] --- Cargo.lock | 22 +++++++++++----------- Cargo.toml | 12 ++++++------ package-manifest.toml | 16 ++++++++-------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 75f77524934..906f347ba61 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1542,7 +1542,7 @@ dependencies = [ [[package]] name = "crucible-agent-client" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=88c45eebf34027c3bc80e60a5f527738bcfaf16a#88c45eebf34027c3bc80e60a5f527738bcfaf16a" +source = "git+https://github.com/oxidecomputer/crucible?rev=ea2282e24ecb50bf4aa2cbe069df10b80d96e162#ea2282e24ecb50bf4aa2cbe069df10b80d96e162" dependencies = [ "anyhow", "chrono", @@ -1558,7 +1558,7 @@ dependencies = [ [[package]] name = "crucible-common" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=88c45eebf34027c3bc80e60a5f527738bcfaf16a#88c45eebf34027c3bc80e60a5f527738bcfaf16a" +source = "git+https://github.com/oxidecomputer/crucible?rev=ea2282e24ecb50bf4aa2cbe069df10b80d96e162#ea2282e24ecb50bf4aa2cbe069df10b80d96e162" dependencies = [ "anyhow", "atty", @@ -1588,7 +1588,7 @@ dependencies = [ [[package]] name = "crucible-pantry-client" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=88c45eebf34027c3bc80e60a5f527738bcfaf16a#88c45eebf34027c3bc80e60a5f527738bcfaf16a" +source = "git+https://github.com/oxidecomputer/crucible?rev=ea2282e24ecb50bf4aa2cbe069df10b80d96e162#ea2282e24ecb50bf4aa2cbe069df10b80d96e162" dependencies = [ "anyhow", "chrono", @@ -1605,7 +1605,7 @@ dependencies = [ [[package]] name = "crucible-smf" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=88c45eebf34027c3bc80e60a5f527738bcfaf16a#88c45eebf34027c3bc80e60a5f527738bcfaf16a" +source = "git+https://github.com/oxidecomputer/crucible?rev=ea2282e24ecb50bf4aa2cbe069df10b80d96e162#ea2282e24ecb50bf4aa2cbe069df10b80d96e162" dependencies = [ "crucible-workspace-hack", "libc", @@ -6236,7 +6236,7 @@ dependencies = [ "pq-sys", "pretty_assertions", "progenitor-client", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=2ccd1d18830ff65813db315b6f0bcaa7f5cb9303)", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=6caef4bad42899e9c4f36d90c3877bee0e10624e)", "rand", "rcgen", "ref-cast", @@ -6491,7 +6491,7 @@ dependencies = [ "oximeter-producer", "oxnet", "pretty_assertions", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=2ccd1d18830ff65813db315b6f0bcaa7f5cb9303)", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=6caef4bad42899e9c4f36d90c3877bee0e10624e)", "propolis-mock-server", "rand", "rcgen", @@ -8102,7 +8102,7 @@ dependencies = [ [[package]] name = "propolis-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=2ccd1d18830ff65813db315b6f0bcaa7f5cb9303#2ccd1d18830ff65813db315b6f0bcaa7f5cb9303" +source = "git+https://github.com/oxidecomputer/propolis?rev=6caef4bad42899e9c4f36d90c3877bee0e10624e#6caef4bad42899e9c4f36d90c3877bee0e10624e" dependencies = [ "async-trait", "base64 0.21.7", @@ -8144,7 +8144,7 @@ dependencies = [ [[package]] name = "propolis-mock-server" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=2ccd1d18830ff65813db315b6f0bcaa7f5cb9303#2ccd1d18830ff65813db315b6f0bcaa7f5cb9303" +source = "git+https://github.com/oxidecomputer/propolis?rev=6caef4bad42899e9c4f36d90c3877bee0e10624e#6caef4bad42899e9c4f36d90c3877bee0e10624e" dependencies = [ "anyhow", "atty", @@ -8154,7 +8154,7 @@ dependencies = [ "futures", "hyper 0.14.30", "progenitor", - "propolis_types 0.0.0 (git+https://github.com/oxidecomputer/propolis?rev=2ccd1d18830ff65813db315b6f0bcaa7f5cb9303)", + "propolis_types 0.0.0 (git+https://github.com/oxidecomputer/propolis?rev=6caef4bad42899e9c4f36d90c3877bee0e10624e)", "rand", "reqwest", "schemars", @@ -8186,7 +8186,7 @@ dependencies = [ [[package]] name = "propolis_types" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=2ccd1d18830ff65813db315b6f0bcaa7f5cb9303#2ccd1d18830ff65813db315b6f0bcaa7f5cb9303" +source = "git+https://github.com/oxidecomputer/propolis?rev=6caef4bad42899e9c4f36d90c3877bee0e10624e#6caef4bad42899e9c4f36d90c3877bee0e10624e" dependencies = [ "schemars", "serde", @@ -9739,7 +9739,7 @@ dependencies = [ "omicron-uuid-kinds", "omicron-workspace-hack", "oxnet", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=2ccd1d18830ff65813db315b6f0bcaa7f5cb9303)", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=6caef4bad42899e9c4f36d90c3877bee0e10624e)", "rcgen", "schemars", "serde", diff --git a/Cargo.toml b/Cargo.toml index 82cdf70d38d..30ed1d8b1ef 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -323,10 +323,10 @@ cookie = "0.18" criterion = { version = "0.5.1", features = [ "async_tokio" ] } crossbeam = "0.8" crossterm = { version = "0.28.1", features = ["event-stream"] } -crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "88c45eebf34027c3bc80e60a5f527738bcfaf16a" } -crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "88c45eebf34027c3bc80e60a5f527738bcfaf16a" } -crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "88c45eebf34027c3bc80e60a5f527738bcfaf16a" } -crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "88c45eebf34027c3bc80e60a5f527738bcfaf16a" } +crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "ea2282e24ecb50bf4aa2cbe069df10b80d96e162" } +crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "ea2282e24ecb50bf4aa2cbe069df10b80d96e162" } +crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "ea2282e24ecb50bf4aa2cbe069df10b80d96e162" } +crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "ea2282e24ecb50bf4aa2cbe069df10b80d96e162" } csv = "1.3.0" curve25519-dalek = "4" datatest-stable = "0.2.9" @@ -501,8 +501,8 @@ proc-macro2 = "1.0" progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" } progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" } bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" } -propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "2ccd1d18830ff65813db315b6f0bcaa7f5cb9303" } -propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "2ccd1d18830ff65813db315b6f0bcaa7f5cb9303" } +propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "6caef4bad42899e9c4f36d90c3877bee0e10624e" } +propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "6caef4bad42899e9c4f36d90c3877bee0e10624e" } proptest = "1.5.0" qorb = { git = "https://github.com/oxidecomputer/qorb", branch = "master" } quote = "1.0" diff --git a/package-manifest.toml b/package-manifest.toml index cab3c1877eb..544d8c92353 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -569,10 +569,10 @@ only_for_targets.image = "standard" # 3. Use source.type = "manual" instead of "prebuilt" source.type = "prebuilt" source.repo = "crucible" -source.commit = "e58ca3693cb9ce0438947beba10e97ee38a0966b" +source.commit = "ea2282e24ecb50bf4aa2cbe069df10b80d96e162" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible.sha256.txt -source.sha256 = "18dc942935af51ea03161498c44b56bb85b4a5d2499a5ff19ba87c0284e34742" +source.sha256 = "a3e24d1658b8c08bde94306feec141f08fa11e2996517a3c527e5df9c5bbdd5a" output.type = "zone" output.intermediate_only = true @@ -581,10 +581,10 @@ service_name = "crucible_pantry_prebuilt" only_for_targets.image = "standard" source.type = "prebuilt" source.repo = "crucible" -source.commit = "e58ca3693cb9ce0438947beba10e97ee38a0966b" +source.commit = "ea2282e24ecb50bf4aa2cbe069df10b80d96e162" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible-pantry.sha256.txt -source.sha256 = "9067426bb77ce091116a034a19abb96ecd98cc8ac228a147bd3c3283e40d527d" +source.sha256 = "1c6112d408205bc3b2f13201ba1210e04468219fe4677d8eeb23bf7c22509b23" output.type = "zone" output.intermediate_only = true @@ -598,10 +598,10 @@ service_name = "crucible_dtrace" only_for_targets.image = "standard" source.type = "prebuilt" source.repo = "crucible" -source.commit = "e58ca3693cb9ce0438947beba10e97ee38a0966b" +source.commit = "ea2282e24ecb50bf4aa2cbe069df10b80d96e162" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible-dtrace.sha256.txt -source.sha256 = "660e04fdcbacda66e5012ba4ba6cf1022a4d80453da165b1507d97b7386f2691" +source.sha256 = "5693f70abc11d66ae1aceaffe9129b63366a32b2e25ec63f2ab6596765cfa5fe" output.type = "tarball" # Refer to @@ -612,10 +612,10 @@ service_name = "propolis-server" only_for_targets.image = "standard" source.type = "prebuilt" source.repo = "propolis" -source.commit = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" +source.commit = "6caef4bad42899e9c4f36d90c3877bee0e10624e" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image//propolis-server.sha256.txt -source.sha256 = "e716c1fa5c4ee402f8e3a63f667bbcda744f378305f91ff333bebafe5c20d60b" +source.sha256 = "7b48a3f8a4dcd43ee85e13f5dc9593fea06ba956e7e0e3bb0f1d121a5266d239" output.type = "zone" [package.mg-ddm-gz]