Merge branch 'master' into alerting

2016-06-16 16:29:41 +02:00
parent c51facfaef b039a81375
commit 8ec311ade4
87 changed files with 2220 additions and 781 deletions
@@ -63,6 +63,8 @@ func NewReverseProxy(ds *m.DataSource, proxyPath string, targetUrl *url.URL) *ht
 			req.Header.Add("Authorization", dsAuth)
 		}

+		time.Sleep(time.Second * 5)
+
 		// clear cookie headers
 		req.Header.Del("Cookie")
 		req.Header.Del("Set-Cookie")