Merge branch 'master' into invitation

Conflicts:
	scripts/run_celery.sh
This commit is contained in:
Rebecca Law
2016-02-29 16:14:35 +00:00
17 changed files with 309 additions and 55 deletions

View File

@@ -3,5 +3,4 @@
set -e
source environment.sh
celery -A run_celery.notify_celery worker --loglevel=INFO --logfile=/var/log/notify/application.log --concurrency=4 -Q sms,sms-code,email-code,email,process-job,bulk-sms,bulk-email,email-invited-user
celery -A run_celery.notify_celery worker --loglevel=INFO --concurrency=4 -Q sms,sms-code,email-code,email,process-job,bulk-sms,bulk-email,email-invited-user