Merge remote-tracking branch 'fork/bus_multi_dispatch' into alerting_reminder

* fork/bus_multi_dispatch:
  sql: adds tests for InTransaction
  bus: noop should still execute fn
  removes unused code
  bus: Dispatch now passes empty ctx if handler require it
  bus: dont start transaction when creating session
  bus: dont mix ctx/classic handlers
  bus: DispatchCtx can now invoke any handler
  refactoring: renamed AddCtxHandler to AddHandlerCtx PR #12203
  refactoring: transaction manager PR #12203
  fixes typo in code
  check if admin exists or create one in one transaction
  replace begin/end with wrapper function
  bus: support multiple dispatch in one transaction

This commit is contained in:

bergquist

2018-06-15 13:17:24 +02:00

parent 6cd83e182a 09e71e00a3

commit 0cfdebf0a2

13 changed files with 485 additions and 216 deletions

									
										pkg/services/alerting/notifiers/base.go
									
		+1
		
												View File
												
				@@ -6,6 +6,7 @@ import (

					"github.com/grafana/grafana/pkg/bus"

					"github.com/grafana/grafana/pkg/log"

					"github.com/grafana/grafana/pkg/models"

					"github.com/grafana/grafana/pkg/services/alerting"

				)