Merge branch 'master' into alerting_definitions

2016-06-08 09:36:50 +02:00
parent e4ea24dfc4 1d8fdc09e7
commit 26d93d7130
20 changed files with 374 additions and 231 deletions
@@ -12,7 +12,7 @@ import (
 	"github.com/grafana/grafana/pkg/util"
 )

-func GetTestMetrics(c *middleware.Context) {
+func GetTestMetrics(c *middleware.Context) Response {
 	from := c.QueryInt64("from")
 	to := c.QueryInt64("to")
 	maxDataPoints := c.QueryInt64("maxDataPoints")
@@ -37,7 +37,7 @@ func GetTestMetrics(c *middleware.Context) {
 		result.Data[seriesIndex].DataPoints = points
 	}

-	c.JSON(200, &result)
+	return Json(200, &result)
 }

 func GetInternalMetrics(c *middleware.Context) Response {