Merge branch 'master' of github.com:celery/celery

celery/apps/beat.py

@@ -116,6 +116,7 @@ class Beat(object):
             logger.critical('beat raised exception %s: %r',
                             exc.__class__, exc,
                             exc_info=True)
+            raise exc
 
     def init_loader(self):
         # Run the worker init handler.

docs/userguide/tasks.rst

@@ -316,7 +316,7 @@ The request defines the following attributes:
 
 :id: The unique id of the executing task.
 
-:group: The unique id a group, if this task is a member.
+:group: The unique id of the task's :ref:`group <canvas-group>`, if this task is a member.
 
 :chord: The unique id of the chord this task belongs to (if the task
         is part of the header).