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/parity/light_helpers/queue_cull.rs
+++ b/parity/light_helpers/queue_cull.rs
@@ -31,7 +31,7 @@ use futures::{future, Future};

 use parity_reactor::Remote;

-use util::RwLock;
+use parking_lot::RwLock;

 // Attepmt to cull once every 10 minutes.
 const TOKEN: TimerToken = 1;