Merge branch 'network' into beta

This commit is contained in:
arkpar 2016-03-14 11:11:36 +01:00
commit 1c26ffa208
2 changed files with 3 additions and 4 deletions

View File

@ -1,5 +1,4 @@
#!/bin/sh #!/bin/sh
# Running Parity Full Test Sute # Running Parity Full Test Sute
cargo test --features ethcore/json-tests $1 -p ethash -p ethcore-util -p ethcore -p ethsync -p ethcore-rpc -p parity -p cargo test --features ethcore/json-tests $1 -p ethash -p ethcore-util -p ethcore -p ethsync -p ethcore-rpc -p parity -p ethminer
ethminer

View File

@ -297,7 +297,7 @@ impl Discovery {
return; return;
} }
Err(e) => { Err(e) => {
warn!("UDP send error: {:?}, address: {:?}", e, &data.address); debug!("UDP send error: {:?}, address: {:?}", e, &data.address);
return; return;
} }
} }
@ -317,7 +317,7 @@ impl Discovery {
}), }),
Ok(_) => None, Ok(_) => None,
Err(e) => { Err(e) => {
warn!("Error reading UPD socket: {:?}", e); debug!("Error reading UPD socket: {:?}", e);
None None
} }
} }