Merge branch 'mattbostock-verify_datasource_tls'

2017-10-12 10:39:07 +02:00
parent b76de790f9 79afd638bb
commit 4ca3cc90dd
4 changed files with 179 additions and 102 deletions
@@ -6,14 +6,13 @@ import (
 	"net/http"
 	"time"

-	"gopkg.in/macaron.v1"
-
 	"github.com/grafana/grafana/pkg/api/pluginproxy"
 	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/middleware"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/plugins"
 	"github.com/grafana/grafana/pkg/util"
+	macaron "gopkg.in/macaron.v1"
 )

 var pluginProxyTransport = &http.Transport{