Merge branch 'master' into tx_queue_integration

2016-03-07 09:54:07 +01:00
parent e91de78528 318e7e9e04
commit b0ac103900
9 changed files with 305 additions and 132 deletions
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -582,7 +582,7 @@ impl ChainSync {
 	pub fn on_peer_connected(&mut self, io: &mut SyncIo, peer: PeerId) {
 		trace!(target: "sync", "== Connected {}", peer);
 		if let Err(e) = self.send_status(io) {
-			warn!(target:"sync", "Error sending status request: {:?}", e);
+			trace!(target:"sync", "Error sending status request: {:?}", e);
 			io.disable_peer(peer);
 		}
 	}