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

2017-09-28 10:37:57 +02:00
parent 18337f610d 0e5e2f3fb9
commit 5849fbf04e
145 changed files with 676 additions and 42551 deletions
@@ -48,6 +48,7 @@ func (ds *DataSource) GetHttpTransport() (*http.Transport, error) {
 	transport := &http.Transport{
 		TLSClientConfig: &tls.Config{
 			InsecureSkipVerify: true,
+			Renegotiation:      tls.RenegotiateFreelyAsClient,
 		},
 		Proxy: http.ProxyFromEnvironment,
 		Dial: (&net.Dialer{