diff options
| author | Jesse Hallam <jesse.hallam@gmail.com> | 2018-10-25 13:25:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-25 13:25:27 -0400 |
| commit | 937b6480d534b3051cadf4a892a9aa210bec579a (patch) | |
| tree | 7f8bcbde439f25cc9c0e405329ddf8a788208319 /model | |
| parent | 1074a1c7ab0769b0da3525282fcabf961e2ddfce (diff) | |
| download | chat-937b6480d534b3051cadf4a892a9aa210bec579a.tar.gz chat-937b6480d534b3051cadf4a892a9aa210bec579a.tar.bz2 chat-937b6480d534b3051cadf4a892a9aa210bec579a.zip | |
* MM-12342: merge the experimental channel store
* gofmt after upgrading to go 1.11
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/model/config.go b/model/config.go index 6633c785c..60e2574b8 100644 --- a/model/config.go +++ b/model/config.go @@ -683,17 +683,16 @@ type SSOSettings struct { } type SqlSettings struct { - DriverName *string - DataSource *string - DataSourceReplicas []string - DataSourceSearchReplicas []string - MaxIdleConns *int - ConnMaxLifetimeMilliseconds *int - MaxOpenConns *int - Trace bool - AtRestEncryptKey string - QueryTimeout *int - EnablePublicChannelsMaterialization *bool + DriverName *string + DataSource *string + DataSourceReplicas []string + DataSourceSearchReplicas []string + MaxIdleConns *int + ConnMaxLifetimeMilliseconds *int + MaxOpenConns *int + Trace bool + AtRestEncryptKey string + QueryTimeout *int } func (s *SqlSettings) SetDefaults() { @@ -724,10 +723,6 @@ func (s *SqlSettings) SetDefaults() { if s.QueryTimeout == nil { s.QueryTimeout = NewInt(30) } - - if s.EnablePublicChannelsMaterialization == nil { - s.EnablePublicChannelsMaterialization = NewBool(true) - } } type LogSettings struct { |