merge with master

2016-07-12 13:09:42 +02:00
parent c26627d968 fbc0e0039a
commit 60302acb94
35 changed files with 367 additions and 113 deletions
--- a/parity/configuration.rs
+++ b/parity/configuration.rs
@@ -238,7 +238,7 @@ impl Configuration {
 				})
 			}).collect(),
 			Some(_) => Vec::new(),
-			None => spec.nodes().clone(),
+			None => spec.nodes().to_owned(),
 		}
 	}