opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-03 01:42:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 12556-oauth-pass-thru

Browse Source
This commit is contained in:
Sean Lafferty
2019-03-13 14:25:43 -04:00
parent de338338bf 4bbd6ab79c
commit 8d19ca005f
1039 changed files with 61352 additions and 17151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/pluginproxy/ds_proxy.go
View File

@ -57,7 +57,7 @@ func NewDataSourceProxy(ds *m.DataSource, plugin *plugins.DataSourcePlugin, ctx
func newHTTPClient() httpClient {
return &http.Client{
Timeout: time.Duration(setting.DataProxyTimeout) * time.Second,
Timeout: 30 * time.Second,
Transport: &http.Transport{Proxy: http.ProxyFromEnvironment},
}
}