Commit 5d4f889e authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'ash2k/remove-deprecated-option' into 'master'

Remove deprecated option

See merge request gitlab-org/gitlab-workhorse!513
parents 14a7edc7 10321091
...@@ -12,7 +12,6 @@ func newBackendTransport() (*http.Transport, *net.Dialer) { ...@@ -12,7 +12,6 @@ func newBackendTransport() (*http.Transport, *net.Dialer) {
dialler := &net.Dialer{ dialler := &net.Dialer{
Timeout: 30 * time.Second, Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second, KeepAlive: 30 * time.Second,
DualStack: true,
} }
transport := &http.Transport{ transport := &http.Transport{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment