Merge branch '3.1' of github.com:celery/celery into 3.1

.travis.yml

@@ -18,13 +18,6 @@ before_install:
       sudo apt-get install pypy
       source ~/virtualenv/pypy/bin/activate
     fi
-    if [[ $TOXENV = 3.4 ]]; then
-      sudo apt-get update
-      sudo apt-get install python3.4-dev
-      source ~/virtualenv/python3.4
-      virtualenv ~/virtualenv/python3.4 --python=$(which python3.4)
-      source ~/virtualenv/python3.4/bin/activate
-    fi
     python --version
     uname -a
     lsb_release -a

celery/concurrency/eventlet.py

@@ -142,3 +142,10 @@ class TaskPool(base.BasePool):
         self._quick_put(apply_target, target, args, kwargs,
                         callback, accept_callback,
                         self.getpid)
+
+    def _get_info(self):
+        return {
+            'max-concurrency': self.limit,
+            'free-threads': self._pool.free(),
+            'running-threads': self._pool.running(),
+        }