From fea37a733bb09ec6a9152167ae8db008df4a7cb6 Mon Sep 17 00:00:00 2001 From: Ryan Goodfellow Date: Tue, 30 Apr 2024 08:44:13 -0700 Subject: [PATCH] fix doc comment typos, bump maghemite --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- common/src/api/internal/shared.rs | 4 ++-- nexus/types/src/external_api/params.rs | 4 ++-- package-manifest.toml | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index da1044e0cbf..b1987ae2960 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1609,7 +1609,7 @@ dependencies = [ [[package]] name = "ddm-admin-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/maghemite?rev=42bac86e2fae283563788e7cb9f319a10c13c0d9#42bac86e2fae283563788e7cb9f319a10c13c0d9" +source = "git+https://github.com/oxidecomputer/maghemite?rev=a9d9e9a54a09d669bb69bcdef28cf590b6da7bb5#a9d9e9a54a09d669bb69bcdef28cf590b6da7bb5" dependencies = [ "percent-encoding", "progenitor", @@ -4286,7 +4286,7 @@ dependencies = [ [[package]] name = "mg-admin-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/maghemite?rev=42bac86e2fae283563788e7cb9f319a10c13c0d9#42bac86e2fae283563788e7cb9f319a10c13c0d9" +source = "git+https://github.com/oxidecomputer/maghemite?rev=a9d9e9a54a09d669bb69bcdef28cf590b6da7bb5#a9d9e9a54a09d669bb69bcdef28cf590b6da7bb5" dependencies = [ "anyhow", "chrono", diff --git a/Cargo.toml b/Cargo.toml index e6e8db54b1e..b82712e3b91 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -269,8 +269,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 = "42bac86e2fae283563788e7cb9f319a10c13c0d9" } -ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "42bac86e2fae283563788e7cb9f319a10c13c0d9" } +mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "a9d9e9a54a09d669bb69bcdef28cf590b6da7bb5" } +ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "a9d9e9a54a09d669bb69bcdef28cf590b6da7bb5" } multimap = "0.10.0" nexus-client = { path = "clients/nexus-client" } nexus-config = { path = "nexus-config" } diff --git a/common/src/api/internal/shared.rs b/common/src/api/internal/shared.rs index dddc017cdc6..82a71acf00a 100644 --- a/common/src/api/internal/shared.rs +++ b/common/src/api/internal/shared.rs @@ -185,7 +185,7 @@ pub struct BgpConfig { #[serde(default)] pub shaper: Option, - /// Checker to apply to incomming messages. + /// Checker to apply to incoming messages. #[serde(default)] pub checker: Option, } @@ -209,7 +209,7 @@ pub struct BgpPeerConfig { pub connect_retry: Option, /// The interval to send keepalive messages at. pub keepalive: Option, - /// Requre that a peer has a specified ASN. + /// Require that a peer has a specified ASN. #[serde(default)] pub remote_asn: Option, /// Require messages from a peer have a minimum IP time to live field. diff --git a/nexus/types/src/external_api/params.rs b/nexus/types/src/external_api/params.rs index 0606ff06ed5..e266efdd5bc 100644 --- a/nexus/types/src/external_api/params.rs +++ b/nexus/types/src/external_api/params.rs @@ -1749,7 +1749,7 @@ pub struct BgpPeer { /// How often to send keepalive requests (seconds). pub keepalive: u32, - /// Requre that a peer has a specified ASN. + /// Require that a peer has a specified ASN. pub remote_asn: Option, /// Require messages from a peer have a minimum IP time to live field. @@ -1831,7 +1831,7 @@ pub struct BgpConfigCreate { /// A shaper program to apply to outgoing open and update messages. pub shaper: Option, - /// A checker program to apply to incomming open and update messages. + /// A checker program to apply to incoming open and update messages. pub checker: Option, } diff --git a/package-manifest.toml b/package-manifest.toml index d09766b57d5..da32fc0d8fb 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -533,7 +533,7 @@ 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 = "42bac86e2fae283563788e7cb9f319a10c13c0d9" +source.commit = "a9d9e9a54a09d669bb69bcdef28cf590b6da7bb5" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//maghemite.sha256.txt source.sha256 = "5a4e963837073b541875e56f18097e40f0deceaf88e0ffd723a7fefc78e49cc3" @@ -549,7 +549,7 @@ 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 = "42bac86e2fae283563788e7cb9f319a10c13c0d9" +source.commit = "a9d9e9a54a09d669bb69bcdef28cf590b6da7bb5" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//mg-ddm.sha256.txt source.sha256 = "291dde6e21ad6dccaff0213718f8b552c9cc45106279510421013ceee543e247" @@ -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 = "42bac86e2fae283563788e7cb9f319a10c13c0d9" +source.commit = "a9d9e9a54a09d669bb69bcdef28cf590b6da7bb5" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image//mg-ddm.sha256.txt -source.sha256 = "3e953250d807520bd6cfeb7b25eeb00ec5bf2d47c9fbbcf37478b19a58afb8fd" +source.sha256 = "acbf3a24c391d5a6627b6c2b3f0de7b39a99aa1b22a01184c8f52ce23fa4a0be" output.type = "zone" output.intermediate_only = true