merge with master

This commit is contained in:
Torkel Ödegaard
2017-10-02 14:14:45 +02:00
209 changed files with 9558 additions and 18150 deletions
+1
View File
@@ -54,6 +54,7 @@ func (ds *DataSource) GetHttpTransport() (*http.Transport, error) {
Dial: (&net.Dialer{
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
DualStack: true,
}).Dial,
TLSHandshakeTimeout: 10 * time.Second,
ExpectContinueTimeout: 1 * time.Second,