Skip to content

Commit

Permalink
fix doc comment typos, bump maghemite
Browse files Browse the repository at this point in the history
  • Loading branch information
rcgoodfellow committed Apr 30, 2024
1 parent 589f2d1 commit fea37a7
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 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 @@ -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" }
Expand Down
4 changes: 2 additions & 2 deletions common/src/api/internal/shared.rs
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ pub struct BgpConfig {
#[serde(default)]
pub shaper: Option<String>,

/// Checker to apply to incomming messages.
/// Checker to apply to incoming messages.
#[serde(default)]
pub checker: Option<String>,
}
Expand All @@ -209,7 +209,7 @@ pub struct BgpPeerConfig {
pub connect_retry: Option<u64>,
/// The interval to send keepalive messages at.
pub keepalive: Option<u64>,
/// Requre that a peer has a specified ASN.
/// Require that a peer has a specified ASN.
#[serde(default)]
pub remote_asn: Option<u32>,
/// Require messages from a peer have a minimum IP time to live field.
Expand Down
4 changes: 2 additions & 2 deletions nexus/types/src/external_api/params.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<u32>,

/// Require messages from a peer have a minimum IP time to live field.
Expand Down Expand Up @@ -1831,7 +1831,7 @@ pub struct BgpConfigCreate {
/// A shaper program to apply to outgoing open and update messages.
pub shaper: Option<String>,

/// 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<String>,
}

Expand Down
8 changes: 4 additions & 4 deletions package-manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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/<commit>/maghemite.sha256.txt
source.sha256 = "5a4e963837073b541875e56f18097e40f0deceaf88e0ffd723a7fefc78e49cc3"
Expand All @@ -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/<commit>/mg-ddm.sha256.txt
source.sha256 = "291dde6e21ad6dccaff0213718f8b552c9cc45106279510421013ceee543e247"
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 = "42bac86e2fae283563788e7cb9f319a10c13c0d9"
source.commit = "a9d9e9a54a09d669bb69bcdef28cf590b6da7bb5"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/maghemite/image/<commit>/mg-ddm.sha256.txt
source.sha256 = "3e953250d807520bd6cfeb7b25eeb00ec5bf2d47c9fbbcf37478b19a58afb8fd"
source.sha256 = "acbf3a24c391d5a6627b6c2b3f0de7b39a99aa1b22a01184c8f52ce23fa4a0be"
output.type = "zone"
output.intermediate_only = true

Expand Down

0 comments on commit fea37a7

Please sign in to comment.