mirror of
https://github.com/sigp/lighthouse.git
synced 2026-05-07 16:55:46 +00:00
resolve merge conflicts between untstable and release-v7.0.0
This commit is contained in:
@@ -159,7 +159,7 @@ mockito = "1.5.0"
|
||||
num_cpus = "1"
|
||||
parking_lot = "0.12"
|
||||
paste = "1"
|
||||
prometheus = "0.13"
|
||||
prometheus = { version = "0.13", default-features = false }
|
||||
quickcheck = "1"
|
||||
quickcheck_macros = "1"
|
||||
quote = "1"
|
||||
@@ -174,7 +174,7 @@ reqwest = { version = "0.11", default-features = false, features = [
|
||||
"rustls-tls",
|
||||
"native-tls-vendored",
|
||||
] }
|
||||
ring = "0.16"
|
||||
ring = "0.17"
|
||||
rpds = "0.11"
|
||||
rusqlite = { version = "0.28", features = ["bundled"] }
|
||||
serde = { version = "1", features = ["derive"] }
|
||||
|
||||
Reference in New Issue
Block a user