Merge branch 'master' into light-poa

2017-09-04 12:30:37 +02:00
parent abfa8e95a2 b731ccea18
commit 372779915f
217 changed files with 1613 additions and 1459 deletions
--- a/ethcore/light/src/net/load_timer.rs
+++ b/ethcore/light/src/net/load_timer.rs
@@ -32,7 +32,7 @@ use request::{CompleteRequest, Kind};

 use bincode;
 use time;
-use util::{RwLock, Mutex};
+use parking_lot::{RwLock, Mutex};

 /// Number of time periods samples should be kept for.
 pub const MOVING_SAMPLE_SIZE: usize = 256;