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

# Conflicts:
#	docs/conf.py

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

..

brokers

Django ORM broker

2015-09-14 13:24:43 +02:00

management

adds qinfo management command

2015-08-10 13:20:17 +02:00

migrations

Django ORM broker

2015-09-14 13:24:43 +02:00

tests

Adds test for orm queued task admin

2015-09-14 16:06:18 +02:00

__init__.py

v0.6.4 coming up

2015-09-10 14:49:05 +02:00

admin.py

Adds test for orm queued task admin

2015-09-14 16:06:18 +02:00

apps.py

linting some blank lines

2015-07-10 12:14:57 +02:00

cluster.py

Django ORM broker

2015-09-14 13:24:43 +02:00

conf.py

Django ORM broker

2015-09-14 13:24:43 +02:00

humanhash.py

- Added logging with coloredlogs (for now)

2015-06-16 14:58:44 +02:00

models.py

Django ORM broker

2015-09-14 13:24:43 +02:00

monitor.py

fixing term clear

2015-09-06 19:58:04 +02:00

signing.py

Sets pickle protocol to highest

2015-08-01 11:41:45 +02:00

status.py

fixes connection creation on import

2015-08-31 15:15:24 +02:00

tasks.py

fixes connection creation on import

2015-08-31 15:15:24 +02:00