Skip to content

WIP Do not merge - just testing something#2640

Closed
cyli wants to merge 9 commits intomoby:masterfrom
cyli:thaJeztah-update-grpc-etc
Closed

WIP Do not merge - just testing something#2640
cyli wants to merge 9 commits intomoby:masterfrom
cyli:thaJeztah-update-grpc-etc

Conversation

@cyli
Copy link
Copy Markdown
Contributor

@cyli cyli commented May 22, 2018

Testing fix to #2631

@GordonTheTurtle
Copy link
Copy Markdown

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "thaJeztah-update-grpc-etc" git@github.com:cyli/swarmkit.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354264416
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

thaJeztah and others added 7 commits May 22, 2018 15:07
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
…r that

can surface TLS handshake errors, which GRPC considers transient.

Signed-off-by: Ying Li <ying.li@docker.com>
Signed-off-by: Ying Li <ying.li@docker.com>
@cyli cyli force-pushed the thaJeztah-update-grpc-etc branch from 04dff9b to 8ca2bcf Compare May 22, 2018 22:08
@codecov
Copy link
Copy Markdown

codecov Bot commented May 22, 2018

Codecov Report

Merging #2640 into master will increase coverage by 5.47%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #2640      +/-   ##
==========================================
+ Coverage   61.96%   67.43%   +5.47%     
==========================================
  Files         134       98      -36     
  Lines       21823    14566    -7257     
==========================================
- Hits        13522     9823    -3699     
+ Misses       6856     3732    -3124     
+ Partials     1445     1011     -434

@cyli cyli force-pushed the thaJeztah-update-grpc-etc branch from fb14082 to df3785f Compare May 22, 2018 23:44
…lying

a GRPC server closed, so remove that assertion from the tests.

Signed-off-by: Ying Li <ying.li@docker.com>
@cyli cyli force-pushed the thaJeztah-update-grpc-etc branch from df3785f to ffef158 Compare May 22, 2018 23:54
…gger

to discard in init functions, rather than in TestMain functions.

Signed-off-by: Ying Li <ying.li@docker.com>
@cyli cyli force-pushed the thaJeztah-update-grpc-etc branch from a0f5907 to d3c1362 Compare May 23, 2018 00:30
@cyli cyli closed this Jun 5, 2018
@cyli cyli deleted the thaJeztah-update-grpc-etc branch June 5, 2018 23:24
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