Skip to content
Snippets Groups Projects
Commit ccf09e89 authored by Lloyd Hilaiel's avatar Lloyd Hilaiel
Browse files

Merge pull request #1868 from fmarier/remove_duplicate_config_setting

Remove duplicate copy of the db password setting
parents f72b116d 6fd8c7d1
No related branches found
No related tags found
No related merge requests found
...@@ -108,10 +108,6 @@ var conf = module.exports = convict({ ...@@ -108,10 +108,6 @@ var conf = module.exports = convict({
format: 'string?', format: 'string?',
env: 'DATABASE_NAME' env: 'DATABASE_NAME'
}, },
password: {
format: 'string?',
env: 'MYSQL_PASSWORD'
},
max_query_time_ms: { max_query_time_ms: {
format: 'integer = 5000', format: 'integer = 5000',
doc: "The maximum amount of time we'll allow a query to run before considering the database to be sick", doc: "The maximum amount of time we'll allow a query to run before considering the database to be sick",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment