Skip to content

Commit

Permalink
revert doc comment update
Browse files Browse the repository at this point in the history
Created using spr 1.3.6-beta.1
  • Loading branch information
sunshowers committed Oct 15, 2024
2 parents 68cfd5d + 9ea5002 commit 7a5b9e1
Show file tree
Hide file tree
Showing 16 changed files with 875 additions and 474 deletions.
733 changes: 393 additions & 340 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ cargo_metadata = "0.18.1"
chacha20poly1305 = "0.10.1"
cfg-if = "1.0"
chrono = { version = "0.4", features = [ "serde" ] }
chrono-tz = "0.10.0"
ciborium = "0.2.2"
clap = { version = "4.5", features = ["cargo", "derive", "env", "wrap_help"] }
clickhouse-admin-api = { path = "clickhouse-admin/api" }
Expand Down Expand Up @@ -398,6 +399,7 @@ hyper-util = "0.1.9"
hyper-rustls = "0.26.0"
hyper-staticfile = "0.10.0"
illumos-utils = { path = "illumos-utils" }
iana-time-zone = "0.1.61"
indent_write = "2.2.0"
indexmap = "2.6.0"
indicatif = { version = "0.17.8", features = ["rayon"] }
Expand Down Expand Up @@ -611,7 +613,7 @@ tokio-util = { version = "0.7.12", features = ["io", "io-util"] }
toml = "0.8.19"
toml_edit = "0.22.22"
tough = { version = "0.17.1", features = [ "http" ] }
trybuild = "1.0.99"
trybuild = "1.0.100"
tufaceous = { path = "tufaceous" }
tufaceous-lib = { path = "tufaceous-lib" }
tui-tree-widget = "0.22.0"
Expand Down
20 changes: 10 additions & 10 deletions common/src/api/external/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -726,16 +726,16 @@ impl From<ByteCount> for i64 {
}

/// Generation numbers stored in the database, used for optimistic concurrency
/// control.
///
/// A generation is a value between 0 and 2**63-1, i.e. equivalent to a u63.
/// The reason is that we store it as an i64 in the database, and we want to
/// disallow negative values. (We could potentially use two's complement to
/// store values greater than that as negative values, but surely 2**63 is
/// enough.)
///
/// TODO: This allows deserialization into a value that's out of range. That's
/// not correct. See <https://github.com/oxidecomputer/omicron/issues/6865>.
/// control
//
// A generation is a value between 0 and 2**63-1, i.e. equivalent to a u63.
// The reason is that we store it as an i64 in the database, and we want to
// disallow negative values. (We could potentially use two's complement to
// store values greater than that as negative values, but surely 2**63 is
// enough.)
//
// TODO: This allows deserialization into a value that's out of range. That's
// not correct. See <https://github.com/oxidecomputer/omicron/issues/6865>.
#[derive(
Copy,
Clone,
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/openapi-manager/src/spec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ pub fn all_apis() -> Vec<ApiSpec> {
},
ApiSpec {
title: "Oxide Region API",
version: "20241009.0",
version: "20241204.0",
description: "API for interacting with the Oxide control plane",
boundary: ApiBoundary::External,
api_description:
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/releng/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ use crate::job::Jobs;
/// to as "v8", "version 8", or "release 8" to customers). The use of semantic
/// versioning is mostly to hedge for perhaps wanting something more granular in
/// the future.
const BASE_VERSION: Version = Version::new(11, 0, 0);
const BASE_VERSION: Version = Version::new(12, 0, 0);

const RETRY_ATTEMPTS: usize = 3;

Expand Down
2 changes: 1 addition & 1 deletion nexus/external-api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use omicron_common::api::external::{
use openapi_manager_types::ValidationContext;
use openapiv3::OpenAPI;

pub const API_VERSION: &str = "20241009.0";
pub const API_VERSION: &str = "20241204.0";

// API ENDPOINT FUNCTION NAMING CONVENTIONS
//
Expand Down
2 changes: 1 addition & 1 deletion openapi/nexus.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "https://oxide.computer",
"email": "[email protected]"
},
"version": "20241009.0"
"version": "20241204.0"
},
"paths": {
"/device/auth": {
Expand Down
3 changes: 3 additions & 0 deletions oximeter/db/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,16 @@ async-trait.workspace = true
bcs.workspace = true
camino.workspace = true
chrono.workspace = true
chrono-tz.workspace = true
clap.workspace = true
clickward.workspace = true
dropshot.workspace = true
futures.workspace = true
gethostname.workspace = true
highway.workspace = true
iana-time-zone.workspace = true
libc.workspace = true
nom.workspace = true
num.workspace = true
omicron-common.workspace = true
omicron-workspace-hack.workspace = true
Expand Down
4 changes: 3 additions & 1 deletion oximeter/db/src/bin/oxdb/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,9 @@ async fn main() -> anyhow::Result<()> {
.await?
}
#[cfg(feature = "native-sql")]
Subcommand::NativeSql => oximeter_db::shells::native::shell().await?,
Subcommand::NativeSql => {
oximeter_db::shells::native::shell(args.address).await?
}
}
Ok(())
}
Loading

0 comments on commit 7a5b9e1

Please sign in to comment.