Merge branch 'master' of github.com:grafana/grafana

Conflicts: pkg/services/alerting/eval_context.go
2016-09-06 20:40:49 +02:00
parent fbae6abb3c 2e8d5ca519
commit fc8f0721cd
20 changed files with 239 additions and 157 deletions
@@ -27,6 +27,7 @@ type EvalContext struct {
 	ImagePublicUrl  string
 	ImageOnDiskPath string
 	NoDataFound     bool
+	RetryCount      int
 }

 type StateDescription struct {
@@ -112,5 +113,6 @@ func NewEvalContext(rule *Rule) *EvalContext {
 		DoneChan:    make(chan bool, 1),
 		CancelChan:  make(chan bool, 1),
 		log:         log.New("alerting.evalContext"),
+		RetryCount:  0,
 	}
 }