summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-05-29 15:46:35 -0400
committerGitHub <noreply@github.com>2017-05-29 15:46:35 -0400
commit860e5d483cd952ec833c40312a2141bb3e4ef579 (patch)
treea854943f1f008f9b0f607f486de4b117b98e08e4 /i18n/en.json
parentf9843b380074cc6082566a2752c5482210f912bb (diff)
downloadchat-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 'i18n/en.json')
-rw-r--r--i18n/en.json4
1 files changed, 4 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json
index e5c475d99..0f5d8c9de 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4132,6 +4132,10 @@
"translation": "Invalid maximum idle connection for SQL settings. Must be a positive number."
},
{
+ "id": "model.config.is_valid.sql_query_timeout.app_error",
+ "translation": "Invalid query timeout for SQL settings. Must be a positive number."
+ },
+ {
"id": "model.config.is_valid.sql_max_conn.app_error",
"translation": "Invalid maximum open connection for SQL settings. Must be a positive number."
},