Merge branch 'master' into alert_ui_take2

pkg/services/sqlstore/migrations/migrations_test.go

@@ -6,7 +6,6 @@ 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"
@@ -30,7 +29,6 @@ func TestMigrations(t *testing.T) {
 			sqlutil.CleanDB(x)
 
 			mg := NewMigrator(x)
-			mg.Logger.SetHandler(log15.DiscardHandler())
 			AddMigrations(mg)
 
 			err = mg.Start()