Ilan Steemers ff5531aa99 Merge branch 'master' into orm ...

# Conflicts:
#	docs/conf.py

2015-09-14 16:57:28 +02:00

..

_static

Adds broker and receipts to architecture flowchart

2015-09-06 12:29:21 +02:00

admin.rst

docs: Django ORM broker

2015-09-14 15:38:16 +02:00

brokers.rst

docs: Django ORM broker

2015-09-14 15:38:16 +02:00

cluster.rst

docs: adjusted for multiple brokers

2015-09-06 14:48:33 +02:00

conf.py

docs: version 7

2015-09-14 16:49:31 +02:00

configure.rst

Merge branch 'master' into orm

2015-09-14 16:57:28 +02:00

examples.rst

#56 fakes setting cpu_affinity on unsupported platforms

2015-09-09 13:25:27 +02:00

index.rst

docs: Django ORM broker

2015-09-14 15:38:16 +02:00

install.rst

docs: Amazon SQS broker

2015-09-10 14:11:30 +02:00

Makefile

Adding sphinx builds to Travis

2015-07-13 15:30:12 +02:00

monitor.rst

docs: addsqinfo management command

2015-08-12 12:39:59 +02:00

schedules.rst

docs: minor updates

2015-08-19 13:57:46 +02:00

tasks.rst

docs: minor updates

2015-08-15 17:03:56 +02:00