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

celery/app/task.py

@@ -471,13 +471,14 @@ class Task(object):
         if self.__self__ is not None:
             args = args if isinstance(args, tuple) else tuple(args or ())
             args = (self.__self__,) + args
+            shadow = shadow or self.shadow_name(args, kwargs, options)
 
         preopts = self._get_exec_options()
         options = dict(preopts, **options) if options else preopts
         return app.send_task(
             self.name, args, kwargs, task_id=task_id, producer=producer,
             link=link, link_error=link_error, result_cls=self.AsyncResult,
-            shadow=shadow or self.shadow_name(args, kwargs, options),
+            shadow=shadow,
             **options
         )
 

docs/whatsnew-3.2.rst

@@ -126,7 +126,7 @@ Task.replace
 
     A new builtin task (`celery.accumulate` was added for this purpose)
 
-    Closes #81
+    Closes #817
 
 
 Optimized Beat implementation