From 937b6480d534b3051cadf4a892a9aa210bec579a Mon Sep 17 00:00:00 2001
From: Jesse Hallam <jesse.hallam@gmail.com>
Date: Thu, 25 Oct 2018 13:25:27 -0400
Subject: MM-12342: merge the experimental channel store (#9681)

* MM-12342: merge the experimental channel store

* gofmt after upgrading to go 1.11
---
 model/config.go | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'model/config.go')

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 {
-- 
cgit v1.2.3-1-g7c22