Skip to content

Commit

Permalink
Maghemite merged and bumped.
Browse files Browse the repository at this point in the history
  • Loading branch information
FelixMcFelix committed May 23, 2024
1 parent 7b32e09 commit 753201d
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 18 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,8 @@ macaddr = { version = "1.0.1", features = ["serde_std"] }
maplit = "1.0.2"
mockall = "0.12"
newtype_derive = "0.1.6"
mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "a557af774b2c3cfe1e9e4e27de9ad85de6a02a98" }
ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "a557af774b2c3cfe1e9e4e27de9ad85de6a02a98" }
mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "5630887d0373857f77cb264f84aa19bdec720ce3" }
ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "5630887d0373857f77cb264f84aa19bdec720ce3" }
multimap = "0.10.0"
nexus-client = { path = "clients/nexus-client" }
nexus-config = { path = "nexus-config" }
Expand Down
12 changes: 6 additions & 6 deletions package-manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -533,10 +533,10 @@ source.repo = "maghemite"
# `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
# building `ddm-admin-client` (which will instruct you to update
# `tools/maghemite_openapi_version`).
source.commit = "a557af774b2c3cfe1e9e4e27de9ad85de6a02a98"
source.commit = "5630887d0373857f77cb264f84aa19bdec720ce3"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mg-ddm-gz.sha256.txt
source.sha256 = "b7a88a985bb29c105fffa184c9826e3243e87d3063987b90b39e51abcd8b8526"
source.sha256 = "28965f303a64f49cf5b83322babe1e0ceb4cfe33fb2df8c8d452d8c3ec02d933"
output.type = "tarball"

[package.mg-ddm]
Expand All @@ -549,10 +549,10 @@ source.repo = "maghemite"
# `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
# building `ddm-admin-client` (which will instruct you to update
# `tools/maghemite_openapi_version`).
source.commit = "a557af774b2c3cfe1e9e4e27de9ad85de6a02a98"
source.commit = "5630887d0373857f77cb264f84aa19bdec720ce3"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mg-ddm.sha256.txt
source.sha256 = "8d0556bcf83360df653f72e885cf28e628601f17137d9475a234b1020c6366ba"
source.sha256 = "6fa53be6fc5ad6273e0ca5e969c882ea40c473722415b060dfea420e962d4f8e"
output.type = "zone"
output.intermediate_only = true

Expand All @@ -564,10 +564,10 @@ source.repo = "maghemite"
# `tools/maghemite_openapi_version`. Failing to do so will cause a failure when
# building `ddm-admin-client` (which will instruct you to update
# `tools/maghemite_openapi_version`).
source.commit = "a557af774b2c3cfe1e9e4e27de9ad85de6a02a98"
source.commit = "5630887d0373857f77cb264f84aa19bdec720ce3"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mgd.sha256.txt
source.sha256 = "91fb4c893240e6f781ab6c3d6f2af8c0e9378fd646d1e45233502e3a4d23cb1a"
source.sha256 = "6ae4bc3b332e91706c1c6633a7fc218aac65b7feff5643ee2dbbe79b841e0df3"
output.type = "zone"
output.intermediate_only = true

Expand Down
2 changes: 1 addition & 1 deletion tools/maghemite_ddm_openapi_version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
COMMIT="a557af774b2c3cfe1e9e4e27de9ad85de6a02a98"
COMMIT="5630887d0373857f77cb264f84aa19bdec720ce3"
SHA2="004e873e4120aa26460271368485266b75b7f964e5ed4dbee8fb5db4519470d7"
2 changes: 1 addition & 1 deletion tools/maghemite_mg_openapi_version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
COMMIT="a557af774b2c3cfe1e9e4e27de9ad85de6a02a98"
COMMIT="5630887d0373857f77cb264f84aa19bdec720ce3"
SHA2="fdb33ee7425923560534672264008ef8948d227afce948ab704de092ad72157c"
4 changes: 2 additions & 2 deletions tools/maghemite_mgd_checksums
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
CIDL_SHA256="91fb4c893240e6f781ab6c3d6f2af8c0e9378fd646d1e45233502e3a4d23cb1a"
MGD_LINUX_SHA256="111c111691bb42e5fde4d5a3d2a613ffc7e7e57c536866f4f00fb5afb60c6da4"
CIDL_SHA256="6ae4bc3b332e91706c1c6633a7fc218aac65b7feff5643ee2dbbe79b841e0df3"
MGD_LINUX_SHA256="7930008cf8ce535a8b31043fc3edde0e825bd54d75f73234929bd0037ecc3a41"
4 changes: 2 additions & 2 deletions workspace-hack/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ workspace = true
[dependencies]
ahash = { version = "0.8.11" }
aho-corasick = { version = "1.1.3" }
anyhow = { version = "1.0.83", features = ["backtrace"] }
anyhow = { version = "1.0.86", features = ["backtrace"] }
base16ct = { version = "0.2.0", default-features = false, features = ["alloc"] }
bit-set = { version = "0.5.3" }
bit-vec = { version = "0.6.3" }
Expand Down Expand Up @@ -124,7 +124,7 @@ zeroize = { version = "1.7.0", features = ["std", "zeroize_derive"] }
[build-dependencies]
ahash = { version = "0.8.11" }
aho-corasick = { version = "1.1.3" }
anyhow = { version = "1.0.83", features = ["backtrace"] }
anyhow = { version = "1.0.86", features = ["backtrace"] }
base16ct = { version = "0.2.0", default-features = false, features = ["alloc"] }
bit-set = { version = "0.5.3" }
bit-vec = { version = "0.6.3" }
Expand Down

0 comments on commit 753201d

Please sign in to comment.