Merge branch 'master' into ipc-hypervisor

2016-04-14 21:57:24 +03:00
parent edb8f1fd7e 01e7d2d872
commit dc7e105ef8
36 changed files with 391 additions and 147 deletions
--- a/ipc/tests/Cargo.toml
+++ b/ipc/tests/Cargo.toml
@@ -13,7 +13,7 @@ bincode = "*"
 serde = "0.7.0"
 ethcore-devtools = { path = "../../devtools" }
 semver = "0.2.0"
-nanomsg = "0.5.0"
+nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git" }
 ethcore-ipc-nano = { path = "../nano" }
 ethcore-util = { path = "../../util" }