Merge branch 'master' into bing

This commit is contained in:
Joseph Schorr 2015-04-08 15:23:36 -04:00
commit 19e25ac340
6 changed files with 42 additions and 23 deletions

View file

@ -15,6 +15,7 @@ from auth.permissions import SuperUserPermission
from auth.auth_context import get_authenticated_user
from data.database import User
from util.config.configutil import add_enterprise_config_defaults
from util.config.provider import CannotWriteConfigException
from util.config.validator import validate_service_for_config, SSL_FILENAMES
from data.runmigration import run_alembic_migration