Merge pull request #241 from SurfingNerd/0.11.4

0.11.4

Author: SurfingNerd

Cargo.lock

@@ -25,7 +25,7 @@ number_prefix = "0.2"
 rpassword = "1.0"
 semver = "0.9"
 ansi_term = "0.10"
-parking_lot = "0.11.2"
+parking_lot = "0.12"
 crossbeam-channel = "0.5.2"
 regex = "1.0"
 atty = "0.2.8"

Cargo.toml

@@ -12,7 +12,7 @@ num_cpus = "1.6"
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
-parking_lot = "0.11.2"
+parking_lot = "0.12"
 ethstore = { path = "../../crates/accounts/ethstore" }
 dir = { path = '../../crates/util/dir' }
 panic_hook = { path = "../../crates/util/panic-hook" }

bin/ethstore/Cargo.toml

@@ -13,6 +13,6 @@ atty = "0.2"
 lazy_static = "1.0"
 regex = "1.0"
 time = "0.1"
-parking_lot = "0.11.2"
+parking_lot = "0.12"
 arrayvec = "0.7"
 ansi_term = "0.10"

bin/oe/logger/Cargo.toml

@@ -13,7 +13,7 @@ ethkey = { path = "ethkey" }
 ethstore = { path = "ethstore" }
 log = "0.4"
 parity-crypto = { version = "0.6.2", features = [ "publickey" ] }
-parking_lot = "0.11.2"
+parking_lot = "0.12"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"

crates/accounts/Cargo.toml

@@ -16,7 +16,7 @@ serde_derive = "1.0"
 rustc-hex = "1.0"
 time = "0.1.34"
 itertools = "0.5"
-parking_lot = "0.11.2"
+parking_lot = "0.12"
 parity-crypto = { version = "0.6.2", features = [ "publickey"] }
 ethereum-types = "0.9.2"
 smallvec = "0.6.14"

crates/accounts/ethstore/Cargo.toml

@@ -13,7 +13,7 @@ keccak-hash = "0.5.0"
 tiny-keccak = "2.0.2"
 log = "0.4"
 memmap = "0.6"
-parking_lot = "0.11.2"
+parking_lot = "0.12"
 primal = "0.2.3"
 
 [dev-dependencies]

crates/concensus/ethash/Cargo.toml

@@ -30,7 +30,7 @@ log = "0.4"
 parity-crypto = { version = "0.6.2", features = [ "publickey" ] }
 parity-runtime = { path = "../../runtime/runtime" }
 parity-util-mem = "0.7"
-parking_lot = "0.11.2"
+parking_lot = "0.12"
 price-info = { path = "./price-info", optional = true }
 rlp = { version = "0.4.6" }
 serde = { version = "1.0", features = ["derive"] }

crates/concensus/miner/Cargo.toml

@@ -15,5 +15,5 @@ log = "0.4"
 serde_json = "1.0"
 
 [dev-dependencies]
-parking_lot = "0.11.2"
+parking_lot = "0.12"
 fake-fetch = { path = "../../../net/fake-fetch" }