diff --git a/Cargo.lock b/Cargo.lock index 690c6ee18eb..466064a950c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -734,7 +734,7 @@ dependencies = [ [[package]] name = "bhyve_api" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e#2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e" +source = "git+https://github.com/oxidecomputer/propolis?rev=7d4e2a49b9ef7750140bdddd2391d24d4729ec8c#7d4e2a49b9ef7750140bdddd2391d24d4729ec8c" dependencies = [ "bhyve_api_sys", "libc", @@ -744,7 +744,7 @@ dependencies = [ [[package]] name = "bhyve_api_sys" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e#2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e" +source = "git+https://github.com/oxidecomputer/propolis?rev=7d4e2a49b9ef7750140bdddd2391d24d4729ec8c#7d4e2a49b9ef7750140bdddd2391d24d4729ec8c" dependencies = [ "libc", "strum 0.26.3", @@ -8465,7 +8465,7 @@ dependencies = [ "pq-sys", "pretty_assertions", "progenitor-client 0.10.0", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e)", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=7d4e2a49b9ef7750140bdddd2391d24d4729ec8c)", "qorb", "rand 0.9.2", "range-requests", @@ -8905,7 +8905,7 @@ dependencies = [ "oxnet", "pretty_assertions", "progenitor 0.10.0", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e)", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=7d4e2a49b9ef7750140bdddd2391d24d4729ec8c)", "propolis-mock-server", "propolis_api_types", "rand 0.9.2", @@ -10994,7 +10994,7 @@ dependencies = [ [[package]] name = "propolis-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e#2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e" +source = "git+https://github.com/oxidecomputer/propolis?rev=7d4e2a49b9ef7750140bdddd2391d24d4729ec8c#7d4e2a49b9ef7750140bdddd2391d24d4729ec8c" dependencies = [ "async-trait", "base64 0.21.7", @@ -11039,7 +11039,7 @@ dependencies = [ [[package]] name = "propolis-mock-server" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e#2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e" +source = "git+https://github.com/oxidecomputer/propolis?rev=7d4e2a49b9ef7750140bdddd2391d24d4729ec8c#7d4e2a49b9ef7750140bdddd2391d24d4729ec8c" dependencies = [ "anyhow", "atty", @@ -11083,7 +11083,7 @@ dependencies = [ [[package]] name = "propolis_api_types" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e#2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e" +source = "git+https://github.com/oxidecomputer/propolis?rev=7d4e2a49b9ef7750140bdddd2391d24d4729ec8c#7d4e2a49b9ef7750140bdddd2391d24d4729ec8c" dependencies = [ "crucible-client-types", "propolis_types", @@ -11096,7 +11096,7 @@ dependencies = [ [[package]] name = "propolis_types" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e#2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e" +source = "git+https://github.com/oxidecomputer/propolis?rev=7d4e2a49b9ef7750140bdddd2391d24d4729ec8c#7d4e2a49b9ef7750140bdddd2391d24d4729ec8c" dependencies = [ "schemars 0.8.22", "serde", @@ -13040,7 +13040,7 @@ dependencies = [ "omicron-workspace-hack", "oxnet", "progenitor 0.10.0", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e)", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=7d4e2a49b9ef7750140bdddd2391d24d4729ec8c)", "regress", "reqwest", "schemars 0.8.22", diff --git a/Cargo.toml b/Cargo.toml index ff9c75098fe..62d637daa13 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -680,10 +680,10 @@ progenitor-client = "0.10.0" # NOTE: if you change the pinned revision of the `bhyve_api` and propolis # dependencies, you must also update the references in package-manifest.toml to # match the new revision. -bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e" } -propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e" } -propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e" } -propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e" } +bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "7d4e2a49b9ef7750140bdddd2391d24d4729ec8c" } +propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "7d4e2a49b9ef7750140bdddd2391d24d4729ec8c" } +propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "7d4e2a49b9ef7750140bdddd2391d24d4729ec8c" } +propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "7d4e2a49b9ef7750140bdddd2391d24d4729ec8c" } # NOTE: see above! proptest = "1.7.0" qorb = "0.4.1" diff --git a/package-manifest.toml b/package-manifest.toml index 689958cf15e..2e878b1f046 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -650,10 +650,10 @@ service_name = "propolis-server" only_for_targets.image = "standard" source.type = "prebuilt" source.repo = "propolis" -source.commit = "2aa7f9d0ee84a1c45e821d6444b1d2f0e69b743e" +source.commit = "7d4e2a49b9ef7750140bdddd2391d24d4729ec8c" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image//propolis-server.sha256.txt -source.sha256 = "32bd7ec72221b16c1b4705192e13f665deea9d9b4a1c80b2bd558463d94f5f6e" +source.sha256 = "0d5998ffd44f7103e5012a06ba1280260f6c8ed6f48bb2f58fcc70cbc96cb873" output.type = "zone" [package.mg-ddm-gz]