Merge "set config-filename such that verifier can start Fixed a bug that was introduced that prevents verifier from starting without special environment variables et" into stable

This commit is contained in:
Jenkins 2014-09-16 20:52:57 +00:00 committed by Gerrit Code Review
commit 21464a28e4

View File

@ -21,7 +21,7 @@ config_filename = os.environ.get('STACKTACH_VERIFIER_CONFIG',
'stacktach_verifier_config.json')
try:
from local_settings import *
config_filename = config_filename
config_filename = STACKTACH_VERIFIER_CONFIG
except ImportError:
pass