darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-15 09:42:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into split-sms-and-retry

Browse Source 
Conflicts:
	app/celery/tasks.py
	tests/app/celery/test_tasks.py
This commit is contained in:
Martyn Inglis
2016-06-17 16:39:03 +01:00
parent 51c6d57a86 9a79f0fbbb
commit 838bf1d7d4
38 changed files with 1528 additions and 1362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config.py
View File

@@ -89,8 +89,6 @@ class Config(object):
Queue('research-mode', Exchange('default'), routing_key='research-mode'),
Queue('retry', Exchange('default'), routing_key='retry')
]
TWILIO_ACCOUNT_SID = os.getenv('TWILIO_ACCOUNT_SID')
TWILIO_AUTH_TOKEN = os.getenv('TWILIO_AUTH_TOKEN')
FIRETEXT_API_KEY = os.getenv("FIRETEXT_API_KEY")
LOADTESTING_NUMBER = os.getenv('LOADTESTING_NUMBER')
LOADTESTING_API_KEY = os.getenv("LOADTESTING_API_KEY")