IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-20 11:48:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'new-logger' into alerting_definitions

Browse Source 
Conflicts:
	pkg/services/sqlstore/migrations/migrations_test.go
This commit is contained in:
Torkel Ödegaard 2016-06-07 15:51:22 +02:00
commit e4ea24dfc4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/services/sqlstore/migrations/migrations_test.go
View File

@ -6,6 +6,7 @@ import (
"github.com/go-xorm/xorm"
. "github.com/grafana/grafana/pkg/services/sqlstore/migrator"
"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
"github.com/inconshreveable/log15"
. "github.com/smartystreets/goconvey/convey"
//"github.com/grafana/grafana/pkg/log"
@ -29,7 +30,7 @@ func TestMigrations(t *testing.T) {
sqlutil.CleanDB(x)
mg := NewMigrator(x)
//mg.LogLevel = log.ERROR
mg.Logger.SetHandler(log15.DiscardHandler())
AddMigrations(mg)
err = mg.Start()