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

2016-11-04 12:15:08 +01:00
parent c99f4cb9c5 7165c866c2
commit 2da2d5df56
38 changed files with 347 additions and 161 deletions
@@ -264,7 +264,7 @@ func PauseAlert(c *middleware.Context, dto dtos.PauseAlertCommand) Response {
 		return ApiError(500, "", err)
 	}

-	var response models.AlertStateType = models.AlertStateNoData
+	var response models.AlertStateType = models.AlertStatePending
 	pausedState := "un paused"
 	if cmd.Paused {
 		response = models.AlertStatePaused