Merge branch 'master' into ethminer_crate

Conflicts:
	parity/main.rs
This commit is contained in:
Tomasz Drwięga
2016-03-12 10:22:43 +01:00
7 changed files with 883 additions and 11 deletions

View File

@@ -109,7 +109,7 @@ pub struct Client<V = CanonVerifier> where V: Verifier {
}
const HISTORY: u64 = 1000;
const CLIENT_DB_VER_STR: &'static str = "5.1";
const CLIENT_DB_VER_STR: &'static str = "5.2";
impl Client<CanonVerifier> {
/// Create a new client with given spec and DB path.