Skip to content

[release/1.1] Update cri to f213a05fa6700e49f77468fcfd5af10788565eee.#3693

Merged
crosbymichael merged 1 commit intocontainerd:release/1.1from
Random-Liu:update-cri-release-1.1
Sep 26, 2019
Merged

[release/1.1] Update cri to f213a05fa6700e49f77468fcfd5af10788565eee.#3693
crosbymichael merged 1 commit intocontainerd:release/1.1from
Random-Liu:update-cri-release-1.1

Conversation

@Random-Liu
Copy link
Copy Markdown
Member

  • cri: Fix a bug that exec process is not cleaned up if grpc context is canceled or timeout. cri#1159

Signed-off-by: Lantao Liu [email protected]

@Random-Liu Random-Liu changed the title [release/1.1] Update cri to 6cdb2faa1f30b5203c015dfc7abad44515dd8ccd. [WIP] [release/1.1] Update cri to 6cdb2faa1f30b5203c015dfc7abad44515dd8ccd. Sep 26, 2019
@Random-Liu
Copy link
Copy Markdown
Member Author

Marked WIP for now, let me update some vendors in the cri plugin.

@codecov-io
Copy link
Copy Markdown

codecov-io commented Sep 26, 2019

Codecov Report

Merging #3693 into release/1.1 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.1    #3693   +/-   ##
============================================
  Coverage        49.07%   49.07%           
============================================
  Files               85       85           
  Lines             7598     7598           
============================================
  Hits              3729     3729           
  Misses            3194     3194           
  Partials           675      675
Flag Coverage Δ
#linux 49.07% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5b7f3ab...36ebf62. Read the comment docs.

@Random-Liu Random-Liu force-pushed the update-cri-release-1.1 branch from f99c074 to 36ebf62 Compare September 26, 2019 21:01
@Random-Liu Random-Liu changed the title [WIP] [release/1.1] Update cri to 6cdb2faa1f30b5203c015dfc7abad44515dd8ccd. [release/1.1] Update cri to f213a05fa6700e49f77468fcfd5af10788565eee. Sep 26, 2019
Copy link
Copy Markdown
Member

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

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

LGTM

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@crosbymichael crosbymichael merged commit 05a30d2 into containerd:release/1.1 Sep 26, 2019
@TBBle TBBle mentioned this pull request Sep 14, 2020
8 tasks
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.

4 participants