Merge branch '3.0'

Conflicts:
	Changelog
	README.rst
	celery/__init__.py
	celery/events/state.py
	celery/utils/imports.py
	celery/worker/__init__.py
	docs/includes/introduction.txt
	requirements/default.txt
	setup.cfg

celery/concurrency/solo.py

@@ -15,7 +15,6 @@ from .base import BasePool, apply_target
 
 class TaskPool(BasePool):
     """Solo task pool (blocking, inline, fast)."""
-    no_threads = True
 
     def __init__(self, *args, **kwargs):
         super(TaskPool, self).__init__(*args, **kwargs)

celery/tests/events/test_state.py

@@ -95,10 +95,11 @@ class ev_task_states(replay):
                   runtime=0.1234, hostname='utest1'),
         ]
 
+
 def QTEV(type, uuid, hostname, clock, timestamp=None):
     """Quick task event."""
     return Event('task-{0}'.format(type), uuid=uuid, hostname=hostname,
-            clock=clock, timestamp=timestamp or time())
+                 clock=clock, timestamp=timestamp or time())
 
 
 class ev_logical_clock_ordering(replay):

celery/utils/imports.py

@@ -32,7 +32,6 @@ if sys.version_info > (3, 3):  # pragma: no cover
         if '.' not in q:
             q = '.'.join((obj.__module__, q))
         return q
-
 else:
     def qualname(obj):  # noqa
         if not hasattr(obj, '__name__') and hasattr(obj, '__class__'):

docs/history/changelog-3.0.rst

@@ -9,6 +9,23 @@
 
 If you're looking for versions prior to 3.0.x you should go to :ref:`history`.
 
+.. _version-3.0.21:
+
+3.0.21
+======
+:release-date: 2013-07-05 16:30 P.M BST
+
+- Now depends on :mod:`billiard` 2.7.3.31.
+
+    This version fixed a bug when running without the billiard C extension.
+
+- 3.0.20 broke eventlet/gevent support (worker not starting).
+
+- Fixed memory leak problem when MongoDB result backend was used with the
+  gevent pool.
+
+    Fix contributed by Ross Lawley.
+
 .. _version-3.0.20:
 
 3.0.20

requirements/default.txt

@@ -1,3 +1,3 @@
 pytz
-billiard>=2.7.3.28
+billiard>=2.7.3.31
 kombu>=2.5.11

setup.cfg

@@ -15,5 +15,5 @@ upload-dir = docs/.build/html
 
 [bdist_rpm]
 requires = pytz
-           billiard >= 2.7.3.28
+           billiard >= 2.7.3.31
            kombu >= 2.5.11