Merge branch 'master' into schedule-api-notification

Conflicts:
	tests/app/v2/notifications/test_post_notifications.py
This commit is contained in:
Rebecca Law
2017-05-23 13:58:50 +01:00
11 changed files with 118 additions and 38 deletions

View File

@@ -292,7 +292,7 @@ class Live(Config):
NOTIFY_ENVIRONMENT = 'live'
CSV_UPLOAD_BUCKET_NAME = 'live-notifications-csv-upload'
STATSD_ENABLED = True
FROM_NUMBER = '40604'
FROM_NUMBER = 'GOVUK'
FUNCTIONAL_TEST_PROVIDER_SERVICE_ID = '6c1d81bb-dae2-4ee9-80b0-89a4aae9f649'
FUNCTIONAL_TEST_PROVIDER_SMS_TEMPLATE_ID = 'ba9e1789-a804-40b8-871f-cc60d4c1286f'
PERFORMANCE_PLATFORM_ENABLED = True