diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-06-28 10:34:00 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-06-28 07:34:00 -0700 |
| commit | 005dd0754ba6dec00d8e4a84a297d0f35fbefb2b (patch) | |
| tree | 9a21ff859d987cb067371939f37e385d97f92e03 /webapp | |
| parent | 2dea567dcfcdfcd016c0da55a120c6e854760fb0 (diff) | |
| download | chat-005dd0754ba6dec00d8e4a84a297d0f35fbefb2b.tar.gz chat-005dd0754ba6dec00d8e4a84a297d0f35fbefb2b.tar.bz2 chat-005dd0754ba6dec00d8e4a84a297d0f35fbefb2b.zip | |
Update gorp to support query timeouts on postgres (#6730)
* Update gorp to support query timeouts on postgres
* Update help text to remove postgres exception
* Fix glide.lock
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/admin_console/database_settings.jsx | 2 | ||||
| -rwxr-xr-x | webapp/i18n/en.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/admin_console/database_settings.jsx b/webapp/components/admin_console/database_settings.jsx index 7b8891b2a..e182db70e 100644 --- a/webapp/components/admin_console/database_settings.jsx +++ b/webapp/components/admin_console/database_settings.jsx @@ -142,7 +142,7 @@ export default class DatabaseSettings extends AdminSettings { helpText={ <FormattedMessage id='admin.sql.queryTimeoutDescription' - defaultMessage='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.' + defaultMessage='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.' /> } value={this.state.queryTimeout} diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 419486b9d..b1f688e40 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -832,7 +832,7 @@ "admin.sql.maxOpenTitle": "Maximum Open Connections:", "admin.sql.noteDescription": "Changing properties in this section will require a server restart before taking effect.", "admin.sql.noteTitle": "Note:", - "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.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.", "admin.sql.queryTimeoutExample": "E.g.: \"30\"", "admin.sql.queryTimeoutTitle": "Query Timeout:", "admin.sql.replicas": "Data Source Replicas:", |