IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-30 12:44:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(merge): minor merge fix

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-01-13 15:51:47 +01:00
parent 6da3af5e89
commit 8ff48c126a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/api_plugin.go
View File

@ -6,7 +6,8 @@ import (
"net/http/httputil"
"net/url"
"github.com/Unknwon/macaron"
"gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models"
@ -53,7 +54,7 @@ func ApiPlugin(routeUrl string) macaron.Handler {
targetUrl, _ := url.Parse(routeUrl)
proxy := NewApiPluginProxy(string(ctx), path, targetUrl)
proxy.Transport = dataProxyTransport
proxy.ServeHTTP(c.RW(), c.Req.Request)
proxy.ServeHTTP(c.Resp, c.Req.Request)
}
}