Merge branch 'master' into mdns-high-cpu-tokio

libp2p · Jul 20, 2022 · 2c55c71 · 2c55c71
2 parents ebd0c79 + c8066df
commit 2c55c71
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -108,7 +108,7 @@ smallvec = "1.6.1"
 libp2p-deflate = { version = "0.35.0", path = "transports/deflate", optional = true }
 libp2p-dns = { version = "0.35.0", path = "transports/dns", optional = true, default-features = false }
 libp2p-mdns = { version = "0.39.0", path = "protocols/mdns", optional = true, default-features = false }
-libp2p-tcp = { version = "0.34.0", path = "transports/tcp", default-features = false, optional = true }
+libp2p-tcp = { version = "0.35.0", path = "transports/tcp", default-features = false, optional = true }
 libp2p-websocket = { version = "0.37.0", path = "transports/websocket", optional = true }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]

diff --git a/protocols/mdns/CHANGELOG.md b/protocols/mdns/CHANGELOG.md
@@ -1,6 +1,7 @@
 # 0.39.0 [unreleased]
 
 - Update to `libp2p-swarm` `v0.38.0`.
+- Update to `if-watch` `v1.1.1`.
 
 - Allow users to choose between async-io and tokio runtime
   in the mdns protocol implementation. `async-io` is a default

diff --git a/protocols/mdns/Cargo.toml b/protocols/mdns/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 data-encoding = "2.3.2"
 dns-parser = "0.8.0"
 futures = "0.3.13"
-if-watch = "1.0.0"
+if-watch = "1.1.1"
 lazy_static = "1.4.0"
 libp2p-core = { version = "0.35.0", path = "../../core", default-features = false }
 libp2p-swarm = { version = "0.38.0", path = "../../swarm" }

diff --git a/transports/tcp/CHANGELOG.md b/transports/tcp/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 0.35.0 [unreleased]
+
+- Update to `libp2p-core` `v0.35.0`.
+
+- Update to `if-watch` `v1.1.1`.
+
 # 0.34.0
 
 - Update to `libp2p-core` `v0.34.0`.

diff --git a/transports/tcp/Cargo.toml b/transports/tcp/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-tcp"
 edition = "2021"
 rust-version = "1.56.1"
 description = "TCP/IP transport protocol for libp2p"
-version = "0.34.0"
+version = "0.35.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 async-io-crate = { package = "async-io", version = "1.2.0", optional = true }
 futures = "0.3.8"
 futures-timer = "3.0"
-if-watch = { version = "1.0.0", optional = true }
+if-watch = { version = "1.1.1", optional = true }
 if-addrs = { version = "0.7.0", optional = true }
 ipnet = "2.0.0"
 libc = "0.2.80"