Merge remote-tracking branch 'origin/master' into dev

# Conflicts:
#	docs/conf.py
This commit is contained in:
Ilan Steemers
2015-10-28 12:12:03 +01:00
4 changed files with 7 additions and 6 deletions
+3 -3
View File
@@ -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: