From 593037df000f20c9fb39e942a66f7a5425e5066b Mon Sep 17 00:00:00 2001
From: "Adam H. Leventhal" <ahl@oxide.computer>
Date: Fri, 20 May 2022 11:22:41 -0700
Subject: [PATCH] update to uuid v1.0.0 (part 2 of 2)

---
 Cargo.lock            | 12 ++++++------
 nexus/Cargo.toml      |  2 +-
 package-manifest.toml |  8 ++++----
 sled-agent/Cargo.toml |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 535305345a2..4e534718447 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -733,7 +733,7 @@ dependencies = [
 [[package]]
 name = "crucible"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?rev=57f0951793a74b31afd824bc3a0e5d89a41a540b#57f0951793a74b31afd824bc3a0e5d89a41a540b"
+source = "git+https://github.com/oxidecomputer/crucible?rev=cd74a23ea42ce5e673923a00faf31b0a920191cc#cd74a23ea42ce5e673923a00faf31b0a920191cc"
 dependencies = [
  "aes-gcm-siv",
  "anyhow",
@@ -766,7 +766,7 @@ dependencies = [
 [[package]]
 name = "crucible-agent-client"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?rev=57f0951793a74b31afd824bc3a0e5d89a41a540b#57f0951793a74b31afd824bc3a0e5d89a41a540b"
+source = "git+https://github.com/oxidecomputer/crucible?rev=cd74a23ea42ce5e673923a00faf31b0a920191cc#cd74a23ea42ce5e673923a00faf31b0a920191cc"
 dependencies = [
  "anyhow",
  "chrono",
@@ -781,7 +781,7 @@ dependencies = [
 [[package]]
 name = "crucible-common"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/crucible?rev=57f0951793a74b31afd824bc3a0e5d89a41a540b#57f0951793a74b31afd824bc3a0e5d89a41a540b"
+source = "git+https://github.com/oxidecomputer/crucible?rev=cd74a23ea42ce5e673923a00faf31b0a920191cc#cd74a23ea42ce5e673923a00faf31b0a920191cc"
 dependencies = [
  "anyhow",
  "rusqlite",
@@ -799,7 +799,7 @@ dependencies = [
 [[package]]
 name = "crucible-protocol"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/crucible?rev=57f0951793a74b31afd824bc3a0e5d89a41a540b#57f0951793a74b31afd824bc3a0e5d89a41a540b"
+source = "git+https://github.com/oxidecomputer/crucible?rev=cd74a23ea42ce5e673923a00faf31b0a920191cc#cd74a23ea42ce5e673923a00faf31b0a920191cc"
 dependencies = [
  "anyhow",
  "bincode",
@@ -813,7 +813,7 @@ dependencies = [
 [[package]]
 name = "crucible-scope"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/crucible?rev=57f0951793a74b31afd824bc3a0e5d89a41a540b#57f0951793a74b31afd824bc3a0e5d89a41a540b"
+source = "git+https://github.com/oxidecomputer/crucible?rev=cd74a23ea42ce5e673923a00faf31b0a920191cc#cd74a23ea42ce5e673923a00faf31b0a920191cc"
 dependencies = [
  "anyhow",
  "futures",
@@ -3727,7 +3727,7 @@ dependencies = [
 [[package]]
 name = "propolis-client"
 version = "0.1.0"
-source = "git+https://github.com/oxidecomputer/propolis?rev=b75a0a60d8928632c158e6d433b586d55774c59a#b75a0a60d8928632c158e6d433b586d55774c59a"
+source = "git+https://github.com/oxidecomputer/propolis?rev=a11ccd5bf001e0c690c67d117f8beb06b0bc6914#a11ccd5bf001e0c690c67d117f8beb06b0bc6914"
 dependencies = [
  "crucible",
  "reqwest",
diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml
index eb112f04946..eada7c8526d 100644
--- a/nexus/Cargo.toml
+++ b/nexus/Cargo.toml
@@ -15,7 +15,7 @@ authz-macros = { path = "src/authz/authz-macros" }
 base64 = "0.13.0"
 bb8 = "0.8.0"
 cookie = "0.16"
-crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "57f0951793a74b31afd824bc3a0e5d89a41a540b" }
+crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "cd74a23ea42ce5e673923a00faf31b0a920191cc" }
 diesel = { version = "2.0.0-rc.0", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
 diesel-dtrace = { git = "https://github.com/oxidecomputer/diesel-dtrace" }
 fatfs = "0.3.5"
diff --git a/package-manifest.toml b/package-manifest.toml
index 6fa15e5c600..434163792c3 100644
--- a/package-manifest.toml
+++ b/package-manifest.toml
@@ -84,10 +84,10 @@ zone = true
 # 3. Use type = "manual" instead of the "prebuilt"
 type = "prebuilt"
 repo = "crucible"
-commit = "8ea317a9dfee65d7c018a1fda89fdec63a560ef3"
+commit = "cd74a23ea42ce5e673923a00faf31b0a920191cc"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
-sha256 = "f85bb22797bab58d128c8dd168a2e6ba57feee284bdc9d0adf282197cb45cccb"
+sha256 = "7e80e513b231a51f322e5c0012536f000bbb0b89c0168654277957ba77eb07a8"
 
 # Refer to
 #   https://github.com/oxidecomputer/propolis/blob/master/package/README.md
@@ -98,7 +98,7 @@ zone = true
 [external_package.propolis-server.source]
 type = "prebuilt"
 repo = "propolis"
-commit = "845c9cffc482739d417761aa1c668895f24b776d"
+commit = "a11ccd5bf001e0c690c67d117f8beb06b0bc6914"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
-sha256 = "80ba693906972d6525767596c95c0c5bafc1c6ff0c9d8cf9b9df437bfefb0bd6"
+sha256 = "52dd465bf70f3130e16cfb32eefb87f5d01514f1f60a7dd9a1eca970a0669159"
diff --git a/sled-agent/Cargo.toml b/sled-agent/Cargo.toml
index 7e50aa76424..d37db4b3b5b 100644
--- a/sled-agent/Cargo.toml
+++ b/sled-agent/Cargo.toml
@@ -13,7 +13,7 @@ bytes = "1.1"
 cfg-if = "1.0"
 chrono = { version = "0.4", features = [ "serde" ] }
 # Only used by the simulated sled agent.
-crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "57f0951793a74b31afd824bc3a0e5d89a41a540b" }
+crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "cd74a23ea42ce5e673923a00faf31b0a920191cc" }
 dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main", features = [ "usdt-probes" ] }
 futures = "0.3.21"
 ipnetwork = "0.18"
@@ -24,7 +24,7 @@ omicron-common = { path = "../common" }
 p256 = "0.9.0"
 percent-encoding = "2.1.0"
 progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
-propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "b75a0a60d8928632c158e6d433b586d55774c59a" }
+propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "a11ccd5bf001e0c690c67d117f8beb06b0bc6914" }
 rand = { version = "0.8.5", features = ["getrandom"] }
 reqwest = { version = "0.11.8", default-features = false, features = ["rustls-tls", "stream"] }
 schemars = { version = "0.8.10", features = [ "chrono", "uuid1" ] }