Merge branch 'master' of github.com:ethcore/parity into beta

2016-06-30 16:11:56 +02:00
parent 34155730ff 24e73f3aec
commit c38d15ad4d
31 changed files with 475 additions and 118 deletions
--- a/signer/src/authcode_store.rs
+++ b/signer/src/authcode_store.rs
@@ -120,7 +120,7 @@ impl<T: TimeProvider> AuthCodes<T> {
 			.filter_map(|f| String::from_utf8(f.to_vec()).ok())
 			.collect::<Vec<String>>()
 			.join("-");
-		info!(target: "signer", "New authentication token generated.");
+		trace!(target: "signer", "New authentication token generated.");
 		self.codes.push(code);
 		Ok(readable_code)
 	}