diff --git a/Cargo.lock b/Cargo.lock index 70a728f0dc7..ddde156424c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1741,10 +1741,11 @@ dependencies = [ [[package]] name = "common" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/dendrite?rev=187aee7de2e50f907099ea06c04aac96c3455665#187aee7de2e50f907099ea06c04aac96c3455665" +source = "git+https://github.com/oxidecomputer/dendrite?rev=cc8e02a0800034c431c8cf96b889ea638da3d194#cc8e02a0800034c431c8cf96b889ea638da3d194" dependencies = [ "anyhow", "chrono", + "oximeter 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "oxnet", "rand 0.9.2", "schemars 0.8.22", @@ -1762,11 +1763,10 @@ dependencies = [ [[package]] name = "common" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/dendrite?rev=cc8e02a0800034c431c8cf96b889ea638da3d194#cc8e02a0800034c431c8cf96b889ea638da3d194" +source = "git+https://github.com/oxidecomputer/dendrite?rev=e6e15dec9f5b46749e02680991155b876f5f0d0a#e6e15dec9f5b46749e02680991155b876f5f0d0a" dependencies = [ "anyhow", "chrono", - "oximeter 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "oxnet", "rand 0.9.2", "schemars 0.8.22", @@ -3108,18 +3108,18 @@ dependencies = [ [[package]] name = "dpd-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/dendrite?rev=187aee7de2e50f907099ea06c04aac96c3455665#187aee7de2e50f907099ea06c04aac96c3455665" +source = "git+https://github.com/oxidecomputer/dendrite?rev=cc8e02a0800034c431c8cf96b889ea638da3d194#cc8e02a0800034c431c8cf96b889ea638da3d194" dependencies = [ "async-trait", "chrono", - "common 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=187aee7de2e50f907099ea06c04aac96c3455665)", + "common 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=cc8e02a0800034c431c8cf96b889ea638da3d194)", "crc8", "futures", "http", "oxnet", - "progenitor 0.13.0", + "progenitor 0.11.2", "regress 0.10.5", - "reqwest 0.13.2", + "reqwest 0.12.28", "schemars 0.8.22", "serde", "serde_json", @@ -3132,18 +3132,18 @@ dependencies = [ [[package]] name = "dpd-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/dendrite?rev=cc8e02a0800034c431c8cf96b889ea638da3d194#cc8e02a0800034c431c8cf96b889ea638da3d194" +source = "git+https://github.com/oxidecomputer/dendrite?rev=e6e15dec9f5b46749e02680991155b876f5f0d0a#e6e15dec9f5b46749e02680991155b876f5f0d0a" dependencies = [ "async-trait", "chrono", - "common 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=cc8e02a0800034c431c8cf96b889ea638da3d194)", + "common 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=e6e15dec9f5b46749e02680991155b876f5f0d0a)", "crc8", "futures", "http", "oxnet", - "progenitor 0.11.2", + "progenitor 0.13.0", "regress 0.10.5", - "reqwest 0.12.28", + "reqwest 0.13.2", "schemars 0.8.22", "serde", "serde_json", @@ -7662,7 +7662,7 @@ dependencies = [ "chrono", "crucible-agent-client", "dns-service-client", - "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=187aee7de2e50f907099ea06c04aac96c3455665)", + "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=e6e15dec9f5b46749e02680991155b876f5f0d0a)", "dropshot 0.17.0", "futures", "gateway-messages", @@ -8631,7 +8631,7 @@ dependencies = [ "display-error-chain", "dns-server", "dns-service-client", - "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=187aee7de2e50f907099ea06c04aac96c3455665)", + "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=e6e15dec9f5b46749e02680991155b876f5f0d0a)", "dropshot 0.17.0", "ereport-types", "expectorate", @@ -16899,7 +16899,7 @@ name = "wicket-common" version = "0.1.0" dependencies = [ "anyhow", - "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=187aee7de2e50f907099ea06c04aac96c3455665)", + "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=e6e15dec9f5b46749e02680991155b876f5f0d0a)", "dropshot 0.17.0", "gateway-client", "gateway-types", @@ -16964,7 +16964,7 @@ dependencies = [ "clap", "debug-ignore", "display-error-chain", - "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=187aee7de2e50f907099ea06c04aac96c3455665)", + "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=e6e15dec9f5b46749e02680991155b876f5f0d0a)", "dropshot 0.17.0", "either", "expectorate", diff --git a/Cargo.toml b/Cargo.toml index 7780221d91f..d0f676e2dfe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -497,7 +497,7 @@ digest = "0.10.7" dns-server = { path = "dns-server" } dns-server-api = { path = "dns-server-api" } dns-service-client = { path = "clients/dns-service-client" } -dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "187aee7de2e50f907099ea06c04aac96c3455665" } +dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "e6e15dec9f5b46749e02680991155b876f5f0d0a" } dropshot = { version = "0.17.0", features = [ "usdt-probes" ] } dropshot-api-manager = "0.7.1" dropshot-api-manager-types = "0.7.1" diff --git a/package-manifest.toml b/package-manifest.toml index 59c82a79971..9e5cf21f001 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -765,8 +765,8 @@ only_for_targets.image = "standard" # the other `source.*` keys. source.type = "prebuilt" source.repo = "dendrite" -source.commit = "187aee7de2e50f907099ea06c04aac96c3455665" -source.sha256 = "2a72f23b76c7e89c9e26b5e9cc646a85120b75972c5dc9058bc6377f834d5d34" +source.commit = "e6e15dec9f5b46749e02680991155b876f5f0d0a" +source.sha256 = "c298440dadde5c58635c96285de0036b139ab1a5d54b6035ef5a42a82d70de37" output.type = "zone" output.intermediate_only = true @@ -792,8 +792,8 @@ only_for_targets.image = "standard" # the other `source.*` keys. source.type = "prebuilt" source.repo = "dendrite" -source.commit = "187aee7de2e50f907099ea06c04aac96c3455665" -source.sha256 = "b8e7e20f1aefc7e2447b89525d6177452c72bbce99d21319cade5a2c12e7a038" +source.commit = "e6e15dec9f5b46749e02680991155b876f5f0d0a" +source.sha256 = "eae2a937b9cc6b8e517db29113efcff2a49d03ea01d6a775ee52be0f0c6db016" output.type = "zone" output.intermediate_only = true @@ -812,8 +812,8 @@ only_for_targets.image = "standard" # the other `source.*` keys. source.type = "prebuilt" source.repo = "dendrite" -source.commit = "187aee7de2e50f907099ea06c04aac96c3455665" -source.sha256 = "657e4f9f6bda938f5f12685076066554089ee4774c92b510f888099966c32a8e" +source.commit = "e6e15dec9f5b46749e02680991155b876f5f0d0a" +source.sha256 = "52d320d209f92080b8fdc257f62a5c2055544c6da5e3bf338ef9810d5756f353" output.type = "zone" output.intermediate_only = true diff --git a/tools/dendrite_stub_checksums b/tools/dendrite_stub_checksums index 6a238d66d80..b4be12cd391 100644 --- a/tools/dendrite_stub_checksums +++ b/tools/dendrite_stub_checksums @@ -1,3 +1,3 @@ -CIDL_SHA256_ILLUMOS="2a72f23b76c7e89c9e26b5e9cc646a85120b75972c5dc9058bc6377f834d5d34" -CIDL_SHA256_LINUX_DPD="bdf0d1bedda8c8aecba489297d374c56aa0578b22b6a601fe399c03fa322ac74" -CIDL_SHA256_LINUX_SWADM="9ae4ee3e4439f154e987c9c0b22947317247b8f63225f175aff2c568d381b881" +CIDL_SHA256_ILLUMOS="c298440dadde5c58635c96285de0036b139ab1a5d54b6035ef5a42a82d70de37" +CIDL_SHA256_LINUX_DPD="77df0e2322431413739ec79c09365fa459fae84974a7e327493498d7e5d097a3" +CIDL_SHA256_LINUX_SWADM="4a6e95a122918768e78bf9e10c67da153a61bee1dae6ac65df688411e2325cfd" diff --git a/tools/dendrite_version b/tools/dendrite_version index 667032070a9..b89e113d422 100644 --- a/tools/dendrite_version +++ b/tools/dendrite_version @@ -1 +1 @@ -COMMIT="187aee7de2e50f907099ea06c04aac96c3455665" +COMMIT="e6e15dec9f5b46749e02680991155b876f5f0d0a"