Merge branch 'master' into clone-work

2016-06-30 13:16:48 +02:00
parent dff7d9603c ff29c82c9e
commit 9c58ebf2d2
14 changed files with 70 additions and 30 deletions
--- a/rpc/src/v1/tests/mocked/ethcore.rs
+++ b/rpc/src/v1/tests/mocked/ethcore.rs
@@ -32,7 +32,7 @@ fn client_service() -> Arc<TestBlockChainClient> {
 }

 fn logger() -> Arc<RotatingLogger> {
-	Arc::new(RotatingLogger::new("rpc=trace".to_owned()))
+	Arc::new(RotatingLogger::new("rpc=trace".to_owned(), false))
 }

 fn settings() -> Arc<NetworkSettings> {