Updates Changelog

Changelog

@@ -34,6 +34,14 @@ If you're looking for versions prior to 3.0.x you should go to :ref:`history`.
 - Worker: Now propagates connection errors occurring in timer callbacks,
   so that the connection can be reset.
 
+- The modules in :setting:`CELERY_IMPORTS` and :setting:`CELERY_INCLUDE`
+  are now imported in the original order (Issue #1161).
+
+    The modules in :setting:`CELERY_IMPORTS` will be imported first,
+    then continued by :setting:`CELERY_INCLUDE`.
+
+    Thanks to Joey Wilhelm.
+
 - New bash completion for ``celery`` available in the git repository:
 
     https://github.com/celery/celery/tree/3.0/extra/bash-completion

docs/configuration.rst

@@ -1081,11 +1081,13 @@ Worker: celeryd
 CELERY_IMPORTS
 ~~~~~~~~~~~~~~
 
-A sequence of modules to import when the celery daemon starts.
+A sequence of modules to import when the worker starts.
 
 This is used to specify the task modules to import, but also
 to import signal handlers and additional remote control commands, etc.
 
+The modules will be imported in the original order.
+
 .. setting:: CELERY_INCLUDE
 
 CELERY_INCLUDE
@@ -1094,6 +1096,9 @@ CELERY_INCLUDE
 Exact same semantics as :setting:`CELERY_IMPORTS`, but can be used as a means
 to have different import categories.
 
+The modules in this setting are imported after the modules in
+:setting:`CELERY_IMPORTS`.
+
 .. setting:: CELERYD_FORCE_EXECV
 
 CELERYD_FORCE_EXECV