darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-09-07 11:08:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into integrate_MMG

Browse Source 
Conflicts:
	app/notifications/rest.py
This commit is contained in:
Rebecca Law
2016-04-06 14:58:13 +01:00
parent 4806123d5c 044f2b7896
commit e8d5a9292a
21 changed files with 770 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config.py
View File

@@ -69,6 +69,7 @@ class Config(object):
Queue('email-code', Exchange('default'), routing_key='email-code'),
Queue('email-reset-password', Exchange('default'), routing_key='email-reset-password'),
Queue('process-job', Exchange('default'), routing_key='process-job'),
Queue('remove-job', Exchange('default'), routing_key='remove-job'),
Queue('bulk-sms', Exchange('default'), routing_key='bulk-sms'),
Queue('bulk-email', Exchange('default'), routing_key='bulk-email'),
Queue('email-invited-user', Exchange('default'), routing_key='email-invited-user'),