Skip to content

Commit 0e54843

Browse files
committed
Merge branch 'vmm-reserve-bench' into vmm-reduce-contention
2 parents 40cef0b + fba0614 commit 0e54843

File tree

21 files changed

+858
-908
lines changed

21 files changed

+858
-908
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ static_assertions = "1.1.0"
651651
steno = "0.4.1"
652652
strum = { version = "0.26", features = [ "derive" ] }
653653
subprocess = "0.2.9"
654-
supports-color = "3.0.1"
654+
supports-color = "3.0.2"
655655
swrite = "0.1.0"
656656
sync-ptr = "0.1.1"
657657
libsw = { version = "3.3.1", features = ["tokio"] }
@@ -666,9 +666,9 @@ textwrap = "0.16.1"
666666
test-strategy = "0.4.0"
667667
thiserror = "1.0"
668668
tofino = { git = "https://github.com/oxidecomputer/tofino", branch = "main" }
669-
tokio = "1.40.0"
669+
tokio = "1.43.0"
670670
tokio-postgres = { version = "0.7", features = [ "with-chrono-0_4", "with-uuid-1" ] }
671-
tokio-stream = "0.1.16"
671+
tokio-stream = "0.1.17"
672672
tokio-tungstenite = "0.23.1"
673673
tokio-util = { version = "0.7.12", features = ["io", "io-util"] }
674674
toml = "0.8.19"

0 commit comments

Comments
 (0)