Skip to content

Commit 1f0447e

Browse files
committed
pull in dendrite PR 220
1 parent ec6d61b commit 1f0447e

5 files changed

Lines changed: 18 additions & 18 deletions

File tree

Cargo.lock

Lines changed: 7 additions & 7 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
@@ -476,7 +476,7 @@ digest = "0.10.7"
476476
dns-server = { path = "dns-server" }
477477
dns-server-api = { path = "dns-server-api" }
478478
dns-service-client = { path = "clients/dns-service-client" }
479-
dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "37992295b5dc708d8f120cee805d67418741b556" }
479+
dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "738980852498c4bf5706ab5e053e09c3f5bf3ce5" }
480480
dropshot = { version = "0.16.6", features = [ "usdt-probes" ] }
481481
dropshot-api-manager = "0.3.0"
482482
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 = "738980852498c4bf5706ab5e053e09c3f5bf3ce5"
752+
source.sha256 = "d02c782997dc772a5412da39ad80246f5c2f7a9b16cf1c70aa217dafd5ebc3c7"
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 = "738980852498c4bf5706ab5e053e09c3f5bf3ce5"
779+
source.sha256 = "6fcfb7900c32ec00eb03b35af89a564365aa693f7c9424412e394837c2473211"
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 = "738980852498c4bf5706ab5e053e09c3f5bf3ce5"
799+
source.sha256 = "82c0fcaa866611fb1d8cc63cb3227f964e59c8fad0721b0bb37634050e2ae5d1"
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="e7f4b2be31f7601cf08ab438685bc89efd99254ad204435158a739dc2de70d4d"
2-
CIDL_SHA256_LINUX_DPD="174c67712317dd8802aa9274ec5213bbe58ae0032408b9e24330655ae01062b0"
3-
CIDL_SHA256_LINUX_SWADM="cc9cdc42db73fe514828cc6d02dd7607a40cf1dca3a508b2d10160103b09cc3f"
1+
CIDL_SHA256_ILLUMOS="d02c782997dc772a5412da39ad80246f5c2f7a9b16cf1c70aa217dafd5ebc3c7"
2+
CIDL_SHA256_LINUX_DPD="c1e0a32d1dec4a6320b9c50b4bc716668e216c0fbbcafec1f201424b1a1c1bee"
3+
CIDL_SHA256_LINUX_SWADM="7af46db45600bb73793c2cf1346c873c5025e25af8e82e7ccd8d4787a2327485"

tools/dendrite_version

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

0 commit comments

Comments
 (0)