Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/cargo/data-encoding-2.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Apr 29, 2024
2 parents a27db34 + 9d86b85 commit 16ec421
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 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.

2 changes: 1 addition & 1 deletion core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ multiaddr = { workspace = true }
multihash = { workspace = true }
multistream-select = { workspace = true }
once_cell = "1.19.0"
parking_lot = "0.12.0"
parking_lot = "0.12.2"
pin-project = "1.1.5"
quick-protobuf = "0.8"
rand = "0.8"
Expand Down
2 changes: 1 addition & 1 deletion transports/dns/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ async-trait = "0.1.80"
futures = { workspace = true }
libp2p-core = { workspace = true }
libp2p-identity = { workspace = true }
parking_lot = "0.12.0"
parking_lot = "0.12.2"
hickory-resolver = { version = "0.24.0", default-features = false, features = ["system-config"] }
smallvec = "1.13.2"
tracing = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion transports/quic/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if-watch = "3.2.0"
libp2p-core = { workspace = true }
libp2p-tls = { workspace = true }
libp2p-identity = { workspace = true }
parking_lot = "0.12.0"
parking_lot = "0.12.2"
quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls", "futures-io"] }
rand = "0.8.5"
rustls = { version = "0.21.9", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion transports/websocket-websys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ futures = { workspace = true }
js-sys = "0.3.69"
libp2p-core = { workspace = true }
tracing = { workspace = true }
parking_lot = "0.12.1"
parking_lot = "0.12.2"
send_wrapper = "0.6.0"
thiserror = "1.0.59"
wasm-bindgen = "0.2.90"
Expand Down
2 changes: 1 addition & 1 deletion transports/websocket/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ either = "1.11.0"
futures = { workspace = true }
libp2p-core = { workspace = true }
libp2p-identity = { workspace = true }
parking_lot = "0.12.0"
parking_lot = "0.12.2"
pin-project-lite = "0.2.14"
rw-stream-sink = { workspace = true }
soketto = "0.8.0"
Expand Down

0 comments on commit 16ec421

Please sign in to comment.