Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[17.10] Increase gRPC request timeout to 20 seconds when sending snapshots #2403

Merged
merged 1 commit into from
Oct 11, 2017

Conversation

nishanttotla
Copy link
Contributor

@nishanttotla nishanttotla commented Oct 11, 2017

Cherry pick #2391.

git cherry-pick -s -x e3e2821fe3eae707915b78215526da078d2d75a7

Cherry-pick was clean.

Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
(cherry picked from commit e3e2821)
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
@nishanttotla
Copy link
Contributor Author

Ping @andrewhsu

@nishanttotla nishanttotla changed the title Increase gRPC request timeout to 20 seconds when sending snapshots [17.10] Increase gRPC request timeout to 20 seconds when sending snapshots Oct 11, 2017
@nishanttotla
Copy link
Contributor Author

nishanttotla commented Oct 11, 2017

@anshulpundir which other branches does this commit need to be cherry picked onto? I want to make sure that #2391 and #2375 go together everywhere. So far, I see 17.06 and 17.03. Not sure about whether #2375 was included in 17.09 or not.

Copy link
Member

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@codecov
Copy link

codecov bot commented Oct 11, 2017

Codecov Report

Merging #2403 into bump_v17.10 will decrease coverage by 0.28%.
The diff coverage is 100%.

@@               Coverage Diff               @@
##           bump_v17.10    #2403      +/-   ##
===============================================
- Coverage        60.85%   60.57%   -0.29%     
===============================================
  Files              128      128              
  Lines            26303    26316      +13     
===============================================
- Hits             16007    15941      -66     
- Misses            8897     8972      +75     
- Partials          1399     1403       +4

@nishanttotla nishanttotla merged commit 1d2bc2e into moby:bump_v17.10 Oct 11, 2017
@nishanttotla nishanttotla deleted the bump_v17.10 branch October 11, 2017 20:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants