fork/django-q2
1
0
Fork 0
mirror of https://github.com/django-q2/django-q2.git synced 2026-10-07 17:38:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into orm

Browse Source 
# Conflicts:
#	docs/conf.py
This commit is contained in:
Ilan Steemers
2015-09-14 16:57:28 +02:00
parent d67e6b9d10 991cf48416
commit ff5531aa99
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
django_q/__init__.py
+1 -1
View File
@@ -9,6 +9,6 @@ from .models import Task, Schedule, Success, Failure
from .cluster import Cluster from .cluster import Cluster
from .status import Stat from .status import Stat
VERSION = (0, 6, 3) VERSION = (0, 6, 4)
default_app_config = 'django_q.apps.DjangoQConfig' default_app_config = 'django_q.apps.DjangoQConfig'
docs/configure.rst
+4 -3
View File
@@ -28,11 +28,12 @@ All configuration settings are optional:
name name
~~~~ ~~~~
Used to differentiate between projects using the same Redis server. Defaults to ``'default'``. Used to differentiate between projects using the same broker.
This can be useful if you have several projects using the same Redis server. On most broker types this will be used as the queue name.
Defaults to ``'default'``.
.. note:: .. note::
Tasks are encrypted. When a worker encounters a task it can not decrypt, it will be discarded. Tasks are encrypted. When a worker encounters a task it can not decrypt, it will be discarded or failed.
workers workers
~~~~~~~ ~~~~~~~
setup.py
+1 -1
View File
@@ -26,7 +26,7 @@ class PyTest(Command):
setup( setup(
name='django-q', name='django-q',
version='0.6.3', version='0.6.4',
author='Ilan Steemers', author='Ilan Steemers',
author_email='koed00@gmail.com', author_email='koed00@gmail.com',
keywords='django task queue worker redis disque multiprocessing', keywords='django task queue worker redis disque multiprocessing',