Merge remote-tracking branch 'origin/master' into consistent-id

2016-12-10 13:36:30 +01:00
parent 5f1fcf95e0 6eb63a7316
commit 82efa2675e
91 changed files with 2514 additions and 525 deletions
--- a/sync/src/tests/mod.rs
+++ b/sync/src/tests/mod.rs
@@ -18,4 +18,6 @@ pub mod helpers;
 pub mod snapshot;
 mod chain;
 mod consensus;
+
+#[cfg(feature = "ipc")]
 mod rpc;