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

2016-09-28 08:09:51 +02:00
parent 460160cfa4 262e7193a3
commit 63caedb094
21 changed files with 202 additions and 47 deletions
@@ -14,7 +14,7 @@ func RenderToPng(c *middleware.Context) {
 	queryParams := fmt.Sprintf("?%s", c.Req.URL.RawQuery)

 	renderOpts := &renderer.RenderOpts{
-		Url:     c.Params("*") + queryParams,
+		Path:    c.Params("*") + queryParams,
 		Width:   queryReader.Get("width", "800"),
 		Height:  queryReader.Get("height", "400"),
 		OrgId:   c.OrgId,