Skip to content

Commit c7961db

Browse files
authored
bump dendrite (#8963)
Related: #8962
1 parent e4022bd commit c7961db

File tree

6 files changed

+24
-19
lines changed

6 files changed

+24
-19
lines changed

Cargo.lock

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ digest = "0.10.7"
432432
dns-server = { path = "dns-server" }
433433
dns-server-api = { path = "dns-server-api" }
434434
dns-service-client = { path = "clients/dns-service-client" }
435-
dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "6e666520620e26432333d9060bc7d249ba9fa92e" }
435+
dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "8314881e372d7bbb4a4ee2da051ecdc34f66c534" }
436436
dropshot = { version = "0.16.3", features = [ "usdt-probes" ] }
437437
dyn-clone = "1.0.20"
438438
either = "1.15.0"

package-manifest.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -735,8 +735,8 @@ only_for_targets.image = "standard"
735735
# the other `source.*` keys.
736736
source.type = "prebuilt"
737737
source.repo = "dendrite"
738-
source.commit = "6e666520620e26432333d9060bc7d249ba9fa92e"
739-
source.sha256 = "040541810a5a172fcf6dc7fae256b5c29075feb60f818e6da0c103fcb8ba20e0"
738+
source.commit = "8314881e372d7bbb4a4ee2da051ecdc34f66c534"
739+
source.sha256 = "33c702ec73d48854e75eeda60e75be57c628dc6b3cc70ae341af0b4b9a99e1b8"
740740
output.type = "zone"
741741
output.intermediate_only = true
742742

@@ -762,8 +762,8 @@ only_for_targets.image = "standard"
762762
# the other `source.*` keys.
763763
source.type = "prebuilt"
764764
source.repo = "dendrite"
765-
source.commit = "6e666520620e26432333d9060bc7d249ba9fa92e"
766-
source.sha256 = "9e355d76b26138ec7114f151bdee00dbc05a29602716d66ddbf34c97d0fb2f0e"
765+
source.commit = "8314881e372d7bbb4a4ee2da051ecdc34f66c534"
766+
source.sha256 = "05543cffe604f8caccf8f3e223b2ee404620f3adc3dd4812e30fd2f5a92f6010"
767767
output.type = "zone"
768768
output.intermediate_only = true
769769

@@ -782,8 +782,8 @@ only_for_targets.image = "standard"
782782
# the other `source.*` keys.
783783
source.type = "prebuilt"
784784
source.repo = "dendrite"
785-
source.commit = "6e666520620e26432333d9060bc7d249ba9fa92e"
786-
source.sha256 = "99d76fd5186aedda7cb5bca3b12b28b1ee468b0d68b70e8b4f591671ba2f799f"
785+
source.commit = "8314881e372d7bbb4a4ee2da051ecdc34f66c534"
786+
source.sha256 = "e57e5cfaadb451c786d94665ae91459d46412541fedcb3d3903766191fdfd2f0"
787787
output.type = "zone"
788788
output.intermediate_only = true
789789

tools/dendrite_stub_checksums

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
CIDL_SHA256_ILLUMOS="040541810a5a172fcf6dc7fae256b5c29075feb60f818e6da0c103fcb8ba20e0"
2-
CIDL_SHA256_LINUX_DPD="08775adafc6be40341b83ced0f269b68d739ba0716ae72e88f81c2c8b3bc2355"
3-
CIDL_SHA256_LINUX_SWADM="52681cafeaa1a0e776c2dc3a0747c0f12870b35a7d9b670fe37a31139ae246f9"
1+
CIDL_SHA256_ILLUMOS="33c702ec73d48854e75eeda60e75be57c628dc6b3cc70ae341af0b4b9a99e1b8"
2+
CIDL_SHA256_LINUX_DPD="670809a9cd9112a4603c71df6ecd894fa777b3ed9cf8055582aab8e5b33ac157"
3+
CIDL_SHA256_LINUX_SWADM="3cc3fd488b7134b3e36507000d79d04d7524e0e0b0af3e0bf950fd5b4f605713"

tools/dendrite_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
COMMIT="6e666520620e26432333d9060bc7d249ba9fa92e"
1+
COMMIT="8314881e372d7bbb4a4ee2da051ecdc34f66c534"

tools/update_dendrite.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ PACKAGES=(
2121
"dendrite-stub"
2222
)
2323

24+
CRATES=(
25+
"dpd-client"
26+
)
27+
2428
REPO="oxidecomputer/dendrite"
2529

2630
. "$SOURCE_DIR/update_helpers.sh"
@@ -73,6 +77,7 @@ function main {
7377
fi
7478
install_toml2json
7579
do_update_packages "$TARGET_COMMIT" "$DRY_RUN" "$REPO" "${PACKAGES[@]}"
80+
do_update_crates "$TARGET_COMMIT" "$DRY_RUN" "$REPO" "${CRATES[@]}"
7681
update_dendrite_stub_shas "$TARGET_COMMIT" "$DRY_RUN"
7782
echo COMMIT=\""$TARGET_COMMIT"\" > tools/dendrite_version
7883
}

0 commit comments

Comments
 (0)