diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-08 16:54:12 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-08 16:54:12 +0000 |
commit | 9104dda057cc7f2c65f07e509013f3cff10db590 (patch) | |
tree | 74af16bfb1bc2afc23fb385727fda39b0f211862 /lib | |
parent | 2b77b43bec240eb5ed2c5422eb810df5eb8edfcc (diff) | |
download | gitlab-ce-9104dda057cc7f2c65f07e509013f3cff10db590.tar.gz |
Add latest changes from gitlab-org/gitlab@14-7-stable-ee
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/gitaly_client.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index cc3f20ab774..a824f97e197 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -56,8 +56,7 @@ module Gitlab # https://gitlab.com/gitlab-org/gitaly/-/blob/bf9f52bc/client/dial.go#L78 { 'grpc.keepalive_time_ms': 20000, - 'grpc.keepalive_permit_without_calls': 1, - 'grpc.http2.max_pings_without_data': 0 + 'grpc.keepalive_permit_without_calls': 1 } end private_class_method :channel_args |