Merge branch 'master' into rpc

Conflicts:
	linux/ws_main.py
	linux_dpdk/ws_main.py

1 files changed, 0 insertions, 11 deletions

diff --git a/src/console/zmq/eventloop/minitornado/concurrent.py b/src/console/zmq/eventloop/minitornado/concurrent.py
deleted file mode 100755
index 519b23d5..00000000
--- a/src/console/zmq/eventloop/minitornado/concurrent.py
+++ /dev/null
@@ -1,11 +0,0 @@
-"""pyzmq does not ship tornado's futures,
-this just raises informative NotImplementedErrors to avoid having to change too much code.
-"""
-
-class NotImplementedFuture(object):
-    def __init__(self, *args, **kwargs):
-        raise NotImplementedError("pyzmq does not ship tornado's Futures, "
-            "install tornado >= 3.0 for future support."
-        )
-
-Future = TracebackFuture = NotImplementedFuture