Skip to content

Commit c298def

Browse files
authored
pull in maghemite 589 (#9564)
1 parent 408f043 commit c298def

6 files changed

Lines changed: 16 additions & 16 deletions

File tree

Cargo.lock

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

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,8 @@ ntp-admin-api = { path = "ntp-admin/api" }
557557
ntp-admin-client = { path = "clients/ntp-admin-client" }
558558
ntp-admin-types = { path = "ntp-admin/types" }
559559
ntp-admin-types-versions = { path = "ntp-admin/types/versions" }
560-
mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "0df320d42b356e689a3c7a7600eec9b16770237a" }
561-
ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "0df320d42b356e689a3c7a7600eec9b16770237a" }
560+
mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "205b3ccf75b527ac7a565285fdcc0c78f4fcee95" }
561+
ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "205b3ccf75b527ac7a565285fdcc0c78f4fcee95" }
562562
multimap = "0.10.1"
563563
nexus-auth = { path = "nexus/auth" }
564564
nexus-background-task-interface = { path = "nexus/background-task-interface" }
@@ -688,7 +688,7 @@ rats-corim = { git = "https://github.com/oxidecomputer/rats-corim.git", rev = "f
688688
raw-cpuid = { git = "https://github.com/oxidecomputer/rust-cpuid.git", rev = "a4cf01df76f35430ff5d39dc2fe470bcb953503b" }
689689
rayon = "1.10"
690690
rcgen = "0.12.1"
691-
rdb-types = { git = "https://github.com/oxidecomputer/maghemite", rev = "0df320d42b356e689a3c7a7600eec9b16770237a" }
691+
rdb-types = { git = "https://github.com/oxidecomputer/maghemite", rev = "205b3ccf75b527ac7a565285fdcc0c78f4fcee95" }
692692
reconfigurator-cli = { path = "dev-tools/reconfigurator-cli" }
693693
reedline = "0.40.0"
694694
ref-cast = "1.0"

package-manifest.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -654,10 +654,10 @@ source.repo = "maghemite"
654654
# `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
655655
# building `ddm-admin-client` (which will instruct you to update
656656
# `tools/maghemite_openapi_version`).
657-
source.commit = "0df320d42b356e689a3c7a7600eec9b16770237a"
657+
source.commit = "205b3ccf75b527ac7a565285fdcc0c78f4fcee95"
658658
# The SHA256 digest is automatically posted to:
659659
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mg-ddm-gz.sha256.txt
660-
source.sha256 = "0c6b756f317decd857b1641e300ed38c0f4cdfad4b77ee2322b2c8365fe95274"
660+
source.sha256 = "fa122dfaf77b1c060f19ca0e044f57044342c8c2b444595ca156ac8885852ebe"
661661
output.type = "tarball"
662662

663663
[package.mg-ddm]
@@ -670,10 +670,10 @@ source.repo = "maghemite"
670670
# `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
671671
# building `ddm-admin-client` (which will instruct you to update
672672
# `tools/maghemite_openapi_version`).
673-
source.commit = "0df320d42b356e689a3c7a7600eec9b16770237a"
673+
source.commit = "205b3ccf75b527ac7a565285fdcc0c78f4fcee95"
674674
# The SHA256 digest is automatically posted to:
675675
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mg-ddm.sha256.txt
676-
source.sha256 = "5ef5389215ca3c1aaeef19a4abb0a01d85a6dabb0c2d6f02449883651e937fef"
676+
source.sha256 = "14c8f3f77149c5aa217f56b57585eb1bcffc507d04910e84fc87c033cbe0ef39"
677677
output.type = "zone"
678678
output.intermediate_only = true
679679

@@ -685,10 +685,10 @@ source.repo = "maghemite"
685685
# `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
686686
# building `ddm-admin-client` (which will instruct you to update
687687
# `tools/maghemite_openapi_version`).
688-
source.commit = "0df320d42b356e689a3c7a7600eec9b16770237a"
688+
source.commit = "205b3ccf75b527ac7a565285fdcc0c78f4fcee95"
689689
# The SHA256 digest is automatically posted to:
690690
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mgd.sha256.txt
691-
source.sha256 = "e32f8202e69f7238efde2470f2f62e533fd78355a28e4ae99664fba3d91e8ae4"
691+
source.sha256 = "53576d28cae4304db61367d687580e9b96da23e647898b9034fdfa1603376b0c"
692692
output.type = "zone"
693693
output.intermediate_only = true
694694

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
COMMIT="0df320d42b356e689a3c7a7600eec9b16770237a"
1+
COMMIT="205b3ccf75b527ac7a565285fdcc0c78f4fcee95"

tools/maghemite_mg_openapi_version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
COMMIT="0df320d42b356e689a3c7a7600eec9b16770237a"
1+
COMMIT="205b3ccf75b527ac7a565285fdcc0c78f4fcee95"

tools/maghemite_mgd_checksums

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
CIDL_SHA256="e32f8202e69f7238efde2470f2f62e533fd78355a28e4ae99664fba3d91e8ae4"
2-
MGD_LINUX_SHA256="4e7dd03fd7c8fa33b658583c3e95c1b814001e8078e415a4a0dd28e98c87439e"
1+
CIDL_SHA256="53576d28cae4304db61367d687580e9b96da23e647898b9034fdfa1603376b0c"
2+
MGD_LINUX_SHA256="118a3bac35064cd231dfd123a3d6c7aa308fdf099b4ba045dcdfac6fbb4aae92"

0 commit comments

Comments
 (0)