Commit bffe590

Ask Solem

committed

Merge branch 'master' into dbschedule

Conflicts: celery/task/base.py celery/task/schedules.py

2 parents f508afb + 33a1a7d commit bffe590Copy full SHA for bffe590

167 files changed

+4452

-946

lines changed

AUTHORS
Changelog
FAQ
README.rst
celery
- __init__.py
- backends
  - __init__.py
  - amqp.py
  - base.py
  - database.py
  - mongodb.py
- bin
  - celeryd.py
  - celeryd_multi.py
  - celeryev.py
- concurrency
  - __init__.py
  - processes
    - __init__.py
    - pool.py
  - threads.py
- conf.py
- datastructures.py
- db
  - session.py
- decorators.py
- events
  - state.py
- exceptions.py
- execute
  - __init__.py
- log.py
- messaging.py
- result.py
- routes.py
- schedules.py
- serialization.py
- states.py
- task
  - __init__.py
  - base.py
  - builtins.py
  - control.py
  - http.py
  - schedules.py
  - sets.py
- tests
  - test_backends
    - test_base.py
  - test_buckets.py
  - test_events_state.py
  - test_pickle.py
  - test_pool.py
  - test_routes.py
  - test_serialization.py
  - test_task.py
  - test_task_builtins.py
  - test_task_http.py
  - test_worker.py
  - test_worker_controllers.py
  - test_worker_job.py
  - utils.py
- utils
  - __init__.py
  - functional.py
  - mail.py
  - timeutils.py
- worker
  - __init__.py
  - buckets.py
  - control
  - job.py
  - listener.py
contrib
- release
  - doc4allmods
- requirements
  - default.txt
docs
pavement.py
setup.cfg
setup.py
tests
- celeryconfig.py

167 files changed

+4452

-946

lines changed

`‎AUTHORS‎`

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 Ordered by date of first contribution:
 -  Ask Solem <[email protected]>
 +  Ask Solem <[email protected]>
   Grégoire Cachet <[email protected]>
   Vitaly Babiy <[email protected]>
   Brian Rosner <[email protected]>

Comments

(0)