Merge with release.

2016-09-28 09:58:14 -04:00
parent 20fc5bae87 4c8be2bfd2
commit e77b5eb3c3
6 changed files with 18 additions and 113 deletions
--- a/cms/envs/test.py
+++ b/cms/envs/test.py
@@ -335,7 +335,3 @@ INSTALLED_APPS += ('openedx.core.djangoapps.api_admin',)
 # Set the default Oauth2 Provider Model so that migrations can run in
 # verbose mode
 OAUTH2_PROVIDER_APPLICATION_MODEL = 'oauth2_provider.Application'
-
-# Used with Email sending
-RETRY_ACTIVATION_EMAIL_MAX_ATTEMPTS = 5
-RETRY_ACTIVATION_EMAIL_TIMEOUT = 0.5