From b1c33da1336eb7cfdc48581eb4664dc52f9bf42f Mon Sep 17 00:00:00 2001 From: Zeeshan Lakhani Date: Thu, 24 Oct 2024 16:53:27 +0000 Subject: [PATCH] .. --- package-manifest.toml | 12 ++++++------ sled-agent/src/services.rs | 4 ++-- tools/dendrite_openapi_version | 2 +- tools/dendrite_stub_checksums | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-manifest.toml b/package-manifest.toml index c618bc7e8b1..dd0abdfcddf 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -717,8 +717,8 @@ only_for_targets.image = "standard" # the other `source.*` keys. source.type = "prebuilt" source.repo = "dendrite" -source.commit = "64f9e655a9270f27449513fea7a3e2c1eda14a95" -source.sha256 = "64a407e75c35589394d252fccf849f6a4b882d1665756643bcf9b18ae91f979d" +source.commit = "d4acc3f68ad87dece3a08d391e1295733f9dabe9" +source.sha256 = "6dfb10cc49952f4945c5c7470be9a80f45fc0fa9aecf1e0ba81f6ff63e140d13" output.type = "zone" output.intermediate_only = true @@ -744,8 +744,8 @@ only_for_targets.image = "standard" # the other `source.*` keys. source.type = "prebuilt" source.repo = "dendrite" -source.commit = "64f9e655a9270f27449513fea7a3e2c1eda14a95" -source.sha256 = "f3d37c3b540efcdb5f2e7782fe15b75e1e672d7bbf428b4f6366a44d8b273c45" +source.commit = "d4acc3f68ad87dece3a08d391e1295733f9dabe9" +source.sha256 = "43c762a6d633dc58d8ae0dbd180ae68edeb511736b051d66374f77e5c1e51d2d" output.type = "zone" output.intermediate_only = true @@ -764,8 +764,8 @@ only_for_targets.image = "standard" # the other `source.*` keys. source.type = "prebuilt" source.repo = "dendrite" -source.commit = "64f9e655a9270f27449513fea7a3e2c1eda14a95" -source.sha256 = "83920ffa3ebeea86cadcc4b7992c35a5c972997923b81714df67e20904b31576" +source.commit = "d4acc3f68ad87dece3a08d391e1295733f9dabe9" +source.sha256 = "4403b668c17e2e22fda278beb04ed33f9f2587cb874ea04f1fd7ffb3cf823998" output.type = "zone" output.intermediate_only = true diff --git a/sled-agent/src/services.rs b/sled-agent/src/services.rs index 2fd71a8b780..91c5e0809e6 100644 --- a/sled-agent/src/services.rs +++ b/sled-agent/src/services.rs @@ -4478,7 +4478,7 @@ impl ServiceManager { } else { info!( self.inner.log, - "no rack_id/sled_id available yet" + "no sled info available yet" ); } smfh.delpropvalue_default_instance( @@ -4584,7 +4584,7 @@ impl ServiceManager { } else { info!( self.inner.log, - "no rack_id/sled_id available yet" + "no sled info available yet" ); } smfh.delpropvalue_default_instance( diff --git a/tools/dendrite_openapi_version b/tools/dendrite_openapi_version index a5e7877281e..7536638e138 100755 --- a/tools/dendrite_openapi_version +++ b/tools/dendrite_openapi_version @@ -1,2 +1,2 @@ -COMMIT="64f9e655a9270f27449513fea7a3e2c1eda14a95" +COMMIT="d4acc3f68ad87dece3a08d391e1295733f9dabe9" SHA2="b1bcf5ad3c2ce556d861367aa2942340a7ccfe592c83e96dd06923cc151ac26b" diff --git a/tools/dendrite_stub_checksums b/tools/dendrite_stub_checksums index 660aa871f38..b0f82129b09 100644 --- a/tools/dendrite_stub_checksums +++ b/tools/dendrite_stub_checksums @@ -1,3 +1,3 @@ -CIDL_SHA256_ILLUMOS="64a407e75c35589394d252fccf849f6a4b882d1665756643bcf9b18ae91f979d" -CIDL_SHA256_LINUX_DPD="5901ea46e4b147f2d51dc2ed45e1e2c50ae92fdfb45ac17b48c3ecb7103db3dd" -CIDL_SHA256_LINUX_SWADM="ce6de2f619504b21acfa085c5ae258fd57bca06b5d8663fb78ab889d717cc6c2" +CIDL_SHA256_ILLUMOS="6dfb10cc49952f4945c5c7470be9a80f45fc0fa9aecf1e0ba81f6ff63e140d13" +CIDL_SHA256_LINUX_DPD="51429cc24a39e8e9d4d616459ad78e5015b49de52c117f22c753bf3cd0d4d765" +CIDL_SHA256_LINUX_SWADM="cf3735418df9528a9db27c6bb653469d3cf216a9ceadede6102d75fc0eb5e52b"