Merge remote-tracking branch 'tcp/master'

Conflicts: .gitignore .travis.yml
paritytech · Nov 21, 2016 · 938548d · 938548d
2 parents 24f10bc + 4d1d5cb
commit 938548d
Show file tree

Hide file tree

Showing 6 changed files with 747 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@ target
 *.swp
 Cargo.lock
 .idea
+
diff --git a/Cargo.toml b/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "json-tcp-server"
+version = "0.1.0"
+authors = ["NikVolf <nikvolf@gmail.com>"]
+
+[dependencies]
+jsonrpc-core = "4.0"
+mio = "0.5"
+slab   = "0.1.0"
+bytes  = "0.3.0"
+log = "0.3"
+env_logger = "0.3"
+lazy_static = "0.2"
+serde_json = "0.8"
+
+[dev-dependencies]
+rand = "0.3"
diff --git a/README.md b/README.md
@@ -0,0 +1,3 @@
+# json-tcp-server
+
+[![Build Status](https://travis-ci.org/ethcore/json-tcp-server.svg?branch=master)](https://travis-ci.org/ethcore/json-tcp-server)