mirror of
https://github.com/django-q2/django-q2.git
synced 2026-09-22 03:08:11 +08:00
Merge remote-tracking branch 'origin/master' into dev
# Conflicts: # docs/conf.py
This commit is contained in:
+2
-1
@@ -16,7 +16,7 @@ Features
|
||||
- Scheduled and repeated tasks
|
||||
- Encrypted and compressed packages
|
||||
- Failure and success database or cache
|
||||
- Result hooks and groups
|
||||
- Result hooks, groups and chains
|
||||
- Django Admin integration
|
||||
- PaaS compatible with multiple instances
|
||||
- Multi cluster monitor
|
||||
@@ -201,6 +201,7 @@ Acknowledgements
|
||||
`RQ <https://github.com/ui/django-rq>`__
|
||||
- Human readable hashes by
|
||||
`HumanHash <https://github.com/zacharyvoase/humanhash>`__
|
||||
- Redditors feedback at `r/django <https://www.reddit.com/r/django/>`__
|
||||
|
||||
.. |image0| image:: https://travis-ci.org/Koed00/django-q.svg?branch=master
|
||||
:target: https://travis-ci.org/Koed00/django-q
|
||||
|
||||
@@ -5,7 +5,7 @@ from django import get_version
|
||||
myPath = os.path.dirname(os.path.abspath(__file__))
|
||||
sys.path.insert(0, myPath)
|
||||
|
||||
VERSION = (0, 7, 9)
|
||||
VERSION = (0, 7, 10)
|
||||
|
||||
default_app_config = 'django_q.apps.DjangoQConfig'
|
||||
|
||||
|
||||
+3
-3
@@ -11,12 +11,12 @@ Django Q is a native Django task queue, scheduler and worker application using P
|
||||
Features
|
||||
--------
|
||||
|
||||
- Multiprocessing worker poole7u-CG
|
||||
- Multiprocessing worker pools
|
||||
- Asynchronous tasks
|
||||
- Scheduled and repeated tasks
|
||||
- Encrypted and compressed packages
|
||||
- Failure and success database or cache
|
||||
- Result hooks and groups
|
||||
- Result hooks, groups and chains
|
||||
- Django Admin integration
|
||||
- PaaS compatible with multiple instances
|
||||
- Multi cluster monitor
|
||||
@@ -24,7 +24,7 @@ Features
|
||||
- Python 2 and 3
|
||||
|
||||
|
||||
Django Q is tested with: Python 2.7 & 3.5. Django 1.7.10 & 1.8.4
|
||||
Django Q is tested with: Python 2.7 & 3.5. Django 1.7.10 & 1.8.5
|
||||
|
||||
Contents:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user