Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Newdigate <andrew@gitlab.com>2017-10-27 16:19:24 +0300
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2017-10-27 16:19:24 +0300
commit9b2daba270c345aa16adab3b69526273f15af055 (patch)
tree77f536af954d929cb40b40790fe175e589f071d5 /client/dial.go
parent4a056b724e8ea08bcc3416a65006a65c7e1a1f9d (diff)
Upgrade GRPC to v1.7.1
Diffstat (limited to 'client/dial.go')
-rw-r--r--client/dial.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/dial.go b/client/dial.go
index 87e288da7..89f2a10b0 100644
--- a/client/dial.go
+++ b/client/dial.go
@@ -23,8 +23,8 @@ func Dial(rawAddress string, connOpts []grpc.DialOption) (*grpc.ClientConn, erro
}
connOpts = append(connOpts,
- grpc.WithDialer(func(a string, _ time.Duration) (net.Conn, error) {
- return net.Dial(network, a)
+ grpc.WithDialer(func(a string, timeout time.Duration) (net.Conn, error) {
+ return net.DialTimeout(network, a, timeout)
}))
conn, err := grpc.Dial(addr, connOpts...)
if err != nil {