diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-05-29 15:46:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-29 15:46:35 -0400 |
| commit | 860e5d483cd952ec833c40312a2141bb3e4ef579 (patch) | |
| tree | a854943f1f008f9b0f607f486de4b117b98e08e4 /webapp/i18n | |
| parent | f9843b380074cc6082566a2752c5482210f912bb (diff) | |
| download | chat-860e5d483cd952ec833c40312a2141bb3e4ef579.tar.gz chat-860e5d483cd952ec833c40312a2141bb3e4ef579.tar.bz2 chat-860e5d483cd952ec833c40312a2141bb3e4ef579.zip | |
PLT-6341/PLT-6342 Update gorp to mattermost fork and add connection timeout setting (#6410)
* Update gorp to mattermost fork and add connection timeout setting
* Add go dependency
* Rename from connection timeout to query timeout
* Properly add gorp dependency
Diffstat (limited to 'webapp/i18n')
| -rwxr-xr-x | webapp/i18n/en.json | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 04c55d077..fe2a9ae5a 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -818,6 +818,9 @@ "admin.sql.keyTitle": "At Rest Encrypt Key:", "admin.sql.maxConnectionsDescription": "Maximum number of idle connections held open to the database.", "admin.sql.maxConnectionsExample": "E.g.: \"10\"", + "admin.sql.queryTimeoutTitle": "Query Timeout:", + "admin.sql.queryTimeoutDescription": "The number of seconds to wait for a response from the database after opening a connection and sending the query. Errors that you see in the UI or in the logs as a result of a query timeout can vary depending on the type of query. This setting has no effect on PostgreSQL databases.", + "admin.sql.queryTimeoutExample": "E.g.: \"30\"", "admin.sql.maxConnectionsTitle": "Maximum Idle Connections:", "admin.sql.maxOpenDescription": "Maximum number of open connections held open to the database.", "admin.sql.maxOpenExample": "E.g.: \"10\"", |