summaryrefslogtreecommitdiffstats
path: root/store/sqlstore/preference_store.go
diff options
context:
space:
mode:
authorMartin Kraft <martinkraft@gmail.com>2018-05-01 18:59:20 -0400
committerMartin Kraft <martinkraft@gmail.com>2018-05-01 18:59:20 -0400
commitff6c42309c4dd328b5841cfeef6b59ea59a4379c (patch)
treec2c3b4938588549ea69653a46d98b27f6fe37b80 /store/sqlstore/preference_store.go
parent2386acb3ddabd8827e21b1862c338a8b13a25de6 (diff)
parente73f1d73143ebba9c7e80d21c45bba9b61f2611c (diff)
downloadchat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.gz
chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.tar.bz2
chat-ff6c42309c4dd328b5841cfeef6b59ea59a4379c.zip
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'store/sqlstore/preference_store.go')
-rw-r--r--store/sqlstore/preference_store.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/store/sqlstore/preference_store.go b/store/sqlstore/preference_store.go
index 791b51d2f..bfe5f6613 100644
--- a/store/sqlstore/preference_store.go
+++ b/store/sqlstore/preference_store.go
@@ -6,9 +6,9 @@ package sqlstore
import (
"net/http"
- l4g "github.com/alecthomas/log4go"
"github.com/mattermost/gorp"
+ "github.com/mattermost/mattermost-server/mlog"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/store"
)
@@ -38,7 +38,7 @@ func (s SqlPreferenceStore) CreateIndexesIfNotExists() {
}
func (s SqlPreferenceStore) DeleteUnusedFeatures() {
- l4g.Debug("Deleting any unused pre-release features")
+ mlog.Debug("Deleting any unused pre-release features")
sql := `DELETE
FROM Preferences