diff --git a/Cargo.lock b/Cargo.lock index 8efed806875..61784c3cc40 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1754,7 +1754,7 @@ dependencies = [ [[package]] name = "common" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/dendrite?rev=e577a94678bf0a8d64d719acd3e19edd965f66a3#e577a94678bf0a8d64d719acd3e19edd965f66a3" +source = "git+https://github.com/oxidecomputer/dendrite?rev=af7c56708b38eb19377728c8f5e090e6abf32255#af7c56708b38eb19377728c8f5e090e6abf32255" dependencies = [ "anyhow", "chrono", @@ -3329,16 +3329,16 @@ dependencies = [ [[package]] name = "dpd-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/dendrite?rev=e577a94678bf0a8d64d719acd3e19edd965f66a3#e577a94678bf0a8d64d719acd3e19edd965f66a3" +source = "git+https://github.com/oxidecomputer/dendrite?rev=af7c56708b38eb19377728c8f5e090e6abf32255#af7c56708b38eb19377728c8f5e090e6abf32255" dependencies = [ "async-trait", "chrono", - "common 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=e577a94678bf0a8d64d719acd3e19edd965f66a3)", - "crc8", + "common 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=af7c56708b38eb19377728c8f5e090e6abf32255)", "futures", "http", "oxnet", - "progenitor 0.14.0", + "progenitor 0.15.1", + "progenitor-extras", "regress 0.11.1", "reqwest", "schemars 0.8.22", @@ -3353,7 +3353,7 @@ dependencies = [ [[package]] name = "dpd-types" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/dendrite?rev=e577a94678bf0a8d64d719acd3e19edd965f66a3#e577a94678bf0a8d64d719acd3e19edd965f66a3" +source = "git+https://github.com/oxidecomputer/dendrite?rev=af7c56708b38eb19377728c8f5e090e6abf32255#af7c56708b38eb19377728c8f5e090e6abf32255" dependencies = [ "dpd-types-versions", ] @@ -3361,7 +3361,7 @@ dependencies = [ [[package]] name = "dpd-types-versions" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/dendrite?rev=e577a94678bf0a8d64d719acd3e19edd965f66a3#e577a94678bf0a8d64d719acd3e19edd965f66a3" +source = "git+https://github.com/oxidecomputer/dendrite?rev=af7c56708b38eb19377728c8f5e090e6abf32255#af7c56708b38eb19377728c8f5e090e6abf32255" dependencies = [ "chrono", "dropshot", @@ -8261,7 +8261,7 @@ dependencies = [ "chrono", "crucible-agent-client", "dns-service-client", - "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=e577a94678bf0a8d64d719acd3e19edd965f66a3)", + "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=af7c56708b38eb19377728c8f5e090e6abf32255)", "dropshot", "fmd-adm-sys", "futures", @@ -9306,7 +9306,7 @@ dependencies = [ "display-error-chain", "dns-server", "dns-service-client", - "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=e577a94678bf0a8d64d719acd3e19edd965f66a3)", + "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=af7c56708b38eb19377728c8f5e090e6abf32255)", "dropshot", "ereport-types", "expectorate", @@ -14657,7 +14657,7 @@ dependencies = [ "daft", "ddm-admin-client", "ddm-api-types", - "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=e577a94678bf0a8d64d719acd3e19edd965f66a3)", + "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=af7c56708b38eb19377728c8f5e090e6abf32255)", "dropshot", "either", "futures", @@ -17946,7 +17946,7 @@ name = "wicket-common" version = "0.1.0" dependencies = [ "anyhow", - "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=e577a94678bf0a8d64d719acd3e19edd965f66a3)", + "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=af7c56708b38eb19377728c8f5e090e6abf32255)", "dropshot", "gateway-client", "gateway-types", @@ -18013,7 +18013,7 @@ dependencies = [ "clap", "debug-ignore", "display-error-chain", - "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=e577a94678bf0a8d64d719acd3e19edd965f66a3)", + "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=af7c56708b38eb19377728c8f5e090e6abf32255)", "dropshot", "either", "expectorate", diff --git a/Cargo.toml b/Cargo.toml index d9407eed992..e1c6b39f1ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -528,7 +528,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 = "e577a94678bf0a8d64d719acd3e19edd965f66a3" } +dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "af7c56708b38eb19377728c8f5e090e6abf32255" } dropshot = { version = "0.17.1", features = [ "usdt-probes" ] } dropshot-api-manager = "0.8.0" dropshot-api-manager-types = "0.8.0" diff --git a/package-manifest.toml b/package-manifest.toml index 7ad761151af..f54495489ad 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -772,8 +772,8 @@ only_for_targets.image = "standard" # the other `source.*` keys. source.type = "prebuilt" source.repo = "dendrite" -source.commit = "e577a94678bf0a8d64d719acd3e19edd965f66a3" -source.sha256 = "afd5c7574aeeea2736ad3f73fdd80b03c581ff4a65d92ad3c3e172d5ea564133" +source.commit = "af7c56708b38eb19377728c8f5e090e6abf32255" +source.sha256 = "9ba0dd803c5715dacc4a0517d8e6e3cb00bdb7f49af1709a58440a6909755cfe" output.type = "zone" output.intermediate_only = true @@ -799,8 +799,8 @@ only_for_targets.image = "standard" # the other `source.*` keys. source.type = "prebuilt" source.repo = "dendrite" -source.commit = "e577a94678bf0a8d64d719acd3e19edd965f66a3" -source.sha256 = "9a5531d907b2d7da89fcb059179edf61a755ec2c86e792b4971396936057dad6" +source.commit = "af7c56708b38eb19377728c8f5e090e6abf32255" +source.sha256 = "3773d850b99bc8d5da8fdee3d73f5b0d6f2aa31fba519ab0c2f19fda7d7eb2cb" output.type = "zone" output.intermediate_only = true @@ -819,8 +819,8 @@ only_for_targets.image = "standard" # the other `source.*` keys. source.type = "prebuilt" source.repo = "dendrite" -source.commit = "e577a94678bf0a8d64d719acd3e19edd965f66a3" -source.sha256 = "319d1f233b7f7df9d8c4d156a6236f7f1f9012cc95c03b0816bb959d7002c28d" +source.commit = "af7c56708b38eb19377728c8f5e090e6abf32255" +source.sha256 = "027eeae4ea47887e1dd5d2a0fe5fcfebf8257cabe272656978ab289f406c519c" output.type = "zone" output.intermediate_only = true diff --git a/tools/dendrite_stub_checksums b/tools/dendrite_stub_checksums index e94d45b56f2..c075280d9ec 100644 --- a/tools/dendrite_stub_checksums +++ b/tools/dendrite_stub_checksums @@ -1,5 +1,5 @@ -CIDL_SHA256_ILLUMOS="afd5c7574aeeea2736ad3f73fdd80b03c581ff4a65d92ad3c3e172d5ea564133" -CIDL_SHA256_LINUX_DPD="80da39c6ba8c76f0e01b0de8acff90acfd2f83f14c1adad7cd3eb69a444235e2" -CIDL_SHA256_LINUX_SWADM="47ce113499d03d8766b071ebfd64211a3ee19e7526a02ff4dcc8c41a4be4b7ec" -CIDL_SHA256_MACOS_AARCH64_DPD="8d3b49061ed0cc9ff0b3373440919abc5f2777aea0ce5a87071dc49f1f5d684b" -CIDL_SHA256_MACOS_AARCH64_SWADM="09744ae2e3bca2b72f3a6281947ea58b2415cee9c752d354b71c948edd29120d" +CIDL_SHA256_ILLUMOS="9ba0dd803c5715dacc4a0517d8e6e3cb00bdb7f49af1709a58440a6909755cfe" +CIDL_SHA256_LINUX_DPD="3115d84179f0ff747453adde06faedad4807c6b73b86e52e6b25da8c70e38541" +CIDL_SHA256_LINUX_SWADM="131bbdba3bdf90c89011dc4278a65d5a1e7696733e87dd566f8bd797de71b509" +CIDL_SHA256_MACOS_AARCH64_DPD="d0a4c39396505b06c09cb6e0feab143a75c4eb187ed3b1eb305a95d166e98879" +CIDL_SHA256_MACOS_AARCH64_SWADM="e4cd8b215ff7bd464070cc443c71732750cb71fb0f061fec092782564e9c9673" diff --git a/tools/dendrite_version b/tools/dendrite_version index 2765d5c6e2d..ec2bc402a32 100644 --- a/tools/dendrite_version +++ b/tools/dendrite_version @@ -1 +1 @@ -COMMIT="e577a94678bf0a8d64d719acd3e19edd965f66a3" +COMMIT="af7c56708b38eb19377728c8f5e090e6abf32255"