Merge branch 'vmm-reduce-contention' into aa-group-of-group

oxidecomputer · Feb 25, 2025 · 804b2ee · 804b2ee
2 parents 75869c7 + 0e54843
commit 804b2ee
Show file tree

Hide file tree

Showing 21 changed files with 858 additions and 908 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -651,7 +651,7 @@ static_assertions = "1.1.0"
 steno = "0.4.1"
 strum = { version = "0.26", features = [ "derive" ] }
 subprocess = "0.2.9"
-supports-color = "3.0.1"
+supports-color = "3.0.2"
 swrite = "0.1.0"
 sync-ptr = "0.1.1"
 libsw = { version = "3.3.1", features = ["tokio"] }
@@ -666,9 +666,9 @@ textwrap = "0.16.1"
 test-strategy = "0.4.0"
 thiserror = "1.0"
 tofino = { git = "https://github.com/oxidecomputer/tofino", branch = "main" }
-tokio = "1.40.0"
+tokio = "1.43.0"
 tokio-postgres = { version = "0.7", features = [ "with-chrono-0_4", "with-uuid-1" ] }
-tokio-stream = "0.1.16"
+tokio-stream = "0.1.17"
 tokio-tungstenite = "0.23.1"
 tokio-util = { version = "0.7.12", features = ["io", "io-util"] }
 toml = "0.8.19"