gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adjust tokio version to just "1"

Browse Source 
(cherry picked from commit 43feef7362)

# Conflicts:
#	faucet/Cargo.toml
#	net-utils/Cargo.toml
This commit is contained in:
Michael Vines
2021-04-05 08:55:57 -07:00
parent 6184254416
commit 270749185c
9 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net-utils/Cargo.toml
View File

@@ -18,10 +18,17 @@ rand = "0.7.0"
serde = "1.0.122"
serde_derive = "1.0.103"
socket2 = "0.3.17"
<<<<<<< HEAD
solana-clap-utils = { path = "../clap-utils", version = "=1.6.5" }
solana-logger = { path = "../logger", version = "=1.6.5" }
solana-version = { path = "../version", version = "=1.6.5" }
tokio = { version = "1.1", features = ["full"] }
=======
solana-clap-utils = { path = "../clap-utils", version = "=1.7.0" }
solana-logger = { path = "../logger", version = "=1.7.0" }
solana-version = { path = "../version", version = "=1.7.0" }
tokio = { version = "1", features = ["full"] }
>>>>>>> 43feef736... Adjust tokio version to just "1"
url = "2.1.1"
[lib]