Skip to content

Commit b555b53

Browse files
update dendrite to multicast-e2e tip (499f3c7)
1 parent f7a9801 commit b555b53

6 files changed

Lines changed: 22 additions & 68 deletions

File tree

Cargo.lock

Lines changed: 8 additions & 54 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
@@ -472,7 +472,7 @@ digest = "0.10.7"
472472
dns-server = { path = "dns-server" }
473473
dns-server-api = { path = "dns-server-api" }
474474
dns-service-client = { path = "clients/dns-service-client" }
475-
dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "37992295b5dc708d8f120cee805d67418741b556" }
475+
dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "499f3c715f0807b8d6b5acddafdbe49bb0450df3" }
476476
dropshot = { version = "0.16.6", features = [ "usdt-probes" ] }
477477
dropshot-api-manager = "0.3.0"
478478
dropshot-api-manager-types = "0.3.0"

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 = "37992295b5dc708d8f120cee805d67418741b556"
752-
source.sha256 = "e7f4b2be31f7601cf08ab438685bc89efd99254ad204435158a739dc2de70d4d"
751+
source.commit = "499f3c715f0807b8d6b5acddafdbe49bb0450df3"
752+
source.sha256 = "c3471a423cd7d2476fd87fa2935b50665b15eed61ee98d048aa358a2ac6b9205"
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 = "37992295b5dc708d8f120cee805d67418741b556"
779-
source.sha256 = "bef902b6a3bc0fff582ea953d6ae970b42369e619aed0794cb669315e3367155"
778+
source.commit = "499f3c715f0807b8d6b5acddafdbe49bb0450df3"
779+
source.sha256 = "237f14a7cc6595a0e5096ad63e895060c379f359e755de5b72078f1d7b90bbb0"
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 = "37992295b5dc708d8f120cee805d67418741b556"
799-
source.sha256 = "27211f3dfd8cd209e5c2758bf9813d4bb17505ddf71b47c8f4f0c880513ffd7c"
798+
source.commit = "499f3c715f0807b8d6b5acddafdbe49bb0450df3"
799+
source.sha256 = "a0bfe696f689a0797957c8bd4108bfb64de1a069596a6d47b06dfa64ecaef2af"
800800
output.type = "zone"
801801
output.intermediate_only = true
802802

sled-agent/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ dice-verifier = { workspace = true, features = ["ipcc", "mock"] }
3333
display-error-chain.workspace = true
3434
dns-server.workspace = true
3535
dns-service-client.workspace = true
36-
# XXX NOTE this is due to https://github.com/oxidecomputer/omicron/issues/9704
37-
# This is the R17 dpd client
36+
# Pinned to avoid version mismatch with DPD on the switch during updates.
37+
# See https://github.com/oxidecomputer/omicron/issues/9704
3838
# dpd-client.workspace = true
39-
dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "cc8e02a0800034c431c8cf96b889ea638da3d194" }
39+
dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "499f3c715f0807b8d6b5acddafdbe49bb0450df3" }
4040
dropshot.workspace = true
4141
flate2.workspace = true
4242
flume.workspace = true

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="e7f4b2be31f7601cf08ab438685bc89efd99254ad204435158a739dc2de70d4d"
2-
CIDL_SHA256_LINUX_DPD="174c67712317dd8802aa9274ec5213bbe58ae0032408b9e24330655ae01062b0"
3-
CIDL_SHA256_LINUX_SWADM="cc9cdc42db73fe514828cc6d02dd7607a40cf1dca3a508b2d10160103b09cc3f"
1+
CIDL_SHA256_ILLUMOS="c3471a423cd7d2476fd87fa2935b50665b15eed61ee98d048aa358a2ac6b9205"
2+
CIDL_SHA256_LINUX_DPD="b6b3822598851c5fc033859abf0933815b0a2515947a01b0e2e0dd02f73ff8bf"
3+
CIDL_SHA256_LINUX_SWADM="4218ac1816b4e4901d1832fb05fac6713400d90aca87f554e64a8bf5ba105563"

tools/dendrite_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
COMMIT="37992295b5dc708d8f120cee805d67418741b556"
1+
COMMIT="499f3c715f0807b8d6b5acddafdbe49bb0450df3"

0 commit comments

Comments
 (0)