Skip to content

Commit c765b35

Browse files
authored
Bump dendrite to get feature-gated multicast (#9746)
1 parent ee838b4 commit c765b35

File tree

7 files changed

+22
-19
lines changed

7 files changed

+22
-19
lines changed

Cargo.lock

Lines changed: 7 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
@@ -465,7 +465,7 @@ digest = "0.10.7"
465465
dns-server = { path = "dns-server" }
466466
dns-server-api = { path = "dns-server-api" }
467467
dns-service-client = { path = "clients/dns-service-client" }
468-
dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "846348bf5c92ab490cf4f69fbe1202691dae6125" }
468+
dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "7a66c1b2415122b821611fd51012032a03e14ada" }
469469
dropshot = { version = "0.16.6", features = [ "usdt-probes" ] }
470470
dropshot-api-manager = "0.2.4"
471471
dropshot-api-manager-types = "0.2.4"

nexus/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ license = "MPL-2.0"
77
[lints]
88
workspace = true
99

10+
[features]
11+
multicast = []
12+
1013
[build-dependencies]
1114
omicron-rpaths.workspace = true
1215

nexus/tests/integration_tests/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ mod ip_pools;
3333
mod local_storage;
3434
mod metrics;
3535
mod metrics_querier;
36+
#[cfg(feature = "multicast")]
3637
mod multicast;
3738
mod oximeter;
3839
mod pantry;

package-manifest.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -748,8 +748,8 @@ only_for_targets.image = "standard"
748748
# the other `source.*` keys.
749749
source.type = "prebuilt"
750750
source.repo = "dendrite"
751-
source.commit = "846348bf5c92ab490cf4f69fbe1202691dae6125"
752-
source.sha256 = "676cb71af9c8b7266ea6c789f0293cbd17d1048b5ed5538a36cc4c6cba80e356"
751+
source.commit = "7a66c1b2415122b821611fd51012032a03e14ada"
752+
source.sha256 = "fd4edbbe2eb3050254198bf146c7e53e85cf52fdaa34ea827e1b1fe9e46dd982"
753753
output.type = "zone"
754754
output.intermediate_only = true
755755

@@ -775,8 +775,8 @@ only_for_targets.image = "standard"
775775
# the other `source.*` keys.
776776
source.type = "prebuilt"
777777
source.repo = "dendrite"
778-
source.commit = "846348bf5c92ab490cf4f69fbe1202691dae6125"
779-
source.sha256 = "1e4d43e73ab68454e5373e23b1b111b66e12b52ae08367979d6e617decd2bb8c"
778+
source.commit = "7a66c1b2415122b821611fd51012032a03e14ada"
779+
source.sha256 = "6d6e3f494e9608bc2f0fd0e172eb7818af339cf44bf91e114070a4193ff04fff"
780780
output.type = "zone"
781781
output.intermediate_only = true
782782

@@ -795,8 +795,8 @@ only_for_targets.image = "standard"
795795
# the other `source.*` keys.
796796
source.type = "prebuilt"
797797
source.repo = "dendrite"
798-
source.commit = "846348bf5c92ab490cf4f69fbe1202691dae6125"
799-
source.sha256 = "63987c847bd4b72e110a858b7dbf48bb9b6a94ce1c377970c7df0d131a2bd8c9"
798+
source.commit = "7a66c1b2415122b821611fd51012032a03e14ada"
799+
source.sha256 = "e27b37c6eb5b90889c1239a3b2e72f4f23da3534357dc05215c19c31f9963bbd"
800800
output.type = "zone"
801801
output.intermediate_only = true
802802

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="676cb71af9c8b7266ea6c789f0293cbd17d1048b5ed5538a36cc4c6cba80e356"
2-
CIDL_SHA256_LINUX_DPD="f653a229c91d75548a328661ced179aefb1874013bdcc1153210a87e61548a67"
3-
CIDL_SHA256_LINUX_SWADM="9d9fa5b7d4fc2dacf21ecb55853fc731eab1bd3cbac71e63b2ad917d4d6d47c1"
1+
CIDL_SHA256_ILLUMOS="fd4edbbe2eb3050254198bf146c7e53e85cf52fdaa34ea827e1b1fe9e46dd982"
2+
CIDL_SHA256_LINUX_DPD="40dc1be3e0a13ec6646b6a201e3523fecd8f2d9da746d84a6a56e11ad59d5dec"
3+
CIDL_SHA256_LINUX_SWADM="b008384cc2c9f9aa40a13ffff99637a38d35c54b4ed3535751124adc8c2107ba"

tools/dendrite_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
COMMIT="846348bf5c92ab490cf4f69fbe1202691dae6125"
1+
COMMIT="7a66c1b2415122b821611fd51012032a03e14ada"

0 commit comments

Comments
 (0)