Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2

This commit is contained in:
Martin Kraft
2018-05-01 18:59:20 -04:00
261 changed files with 168126 additions and 3088 deletions

View File

@@ -6,8 +6,6 @@ package store
import (
"time"
l4g "github.com/alecthomas/log4go"
"github.com/mattermost/mattermost-server/model"
)
@@ -32,7 +30,7 @@ func Do(f func(result *StoreResult)) StoreChannel {
func Must(sc StoreChannel) interface{} {
r := <-sc
if r.Err != nil {
l4g.Close()
time.Sleep(time.Second)
panic(r.Err)
}