Skip to content

Commit 2466950

Browse files
[merge] merge main
2 parents b6b6c63 + d2805f5 commit 2466950

14 files changed

Lines changed: 533 additions & 192 deletions

File tree

Cargo.lock

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

Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ slog-bunyan = "2.5"
8888
slog-error-chain = { git = "https://github.com/oxidecomputer/slog-error-chain", branch = "main" }
8989
socket2 = { version = "0.6", features = ["all"] }
9090
ispf = { git = "https://github.com/oxidecomputer/ispf" }
91-
serde = { version = "1.0.228", features = ["derive"] }
91+
serde = { version = "1.0.229", features = ["derive"] }
9292
hostname = "0.4"
9393
thiserror = "2.0"
9494
dropshot = { version = "0.17.1", features = [ "usdt-probes" ] }
@@ -108,7 +108,7 @@ libnet = { git = "https://github.com/oxidecomputer/netadm-sys", branch = "main"
108108
progenitor = "0.14"
109109
progenitor-client = "0.14"
110110
reqwest = { version = "0.13", default-features = false, features = ["json", "stream", "rustls"] }
111-
clap = { version = "4.6.4", features = ["derive", "unstable-styles", "env"] }
111+
clap = { version = "4.6.5", features = ["derive", "unstable-styles", "env"] }
112112
tabwriter = { version = "1", features = ["ansi_formatting"] }
113113
colored = "3.1"
114114
ztest = { git = "https://github.com/oxidecomputer/falcon", branch = "main" }
@@ -120,7 +120,7 @@ pretty-hex = "0.4"
120120
pretty_assertions = "1.4"
121121
lazy_static = "1.5"
122122
sled = "0.34"
123-
camino = "1.2.4"
123+
camino = "1.2.5"
124124
ciborium = "0.2.2"
125125
http = "1.4.2"
126126
http-body-util = "0.1"
@@ -151,11 +151,11 @@ iddqd = "0.4"
151151

152152
[workspace.dependencies.opte-ioctl]
153153
git = "https://github.com/oxidecomputer/opte"
154-
rev = "3ddd7e684a78ad33be66717408c381b1962ae04e"
154+
rev = "aa4714289cbf28010a821c49d9b73ec94074fb91"
155155

156156
[workspace.dependencies.oxide-vpc]
157157
git = "https://github.com/oxidecomputer/opte"
158-
rev = "3ddd7e684a78ad33be66717408c381b1962ae04e"
158+
rev = "aa4714289cbf28010a821c49d9b73ec94074fb91"
159159

160160
[workspace.dependencies.dpd-client]
161161
git = "https://github.com/oxidecomputer/dendrite"

0 commit comments

Comments
 (0)