Skip to content

[Cherrypick] Fix containerd deadlock.#1913

Merged
estesp merged 1 commit intocontainerd:release/1.0from
Random-Liu:cherry-pick-#1907
Dec 13, 2017
Merged

[Cherrypick] Fix containerd deadlock.#1913
estesp merged 1 commit intocontainerd:release/1.0from
Random-Liu:cherry-pick-#1907

Conversation

@Random-Liu
Copy link
Copy Markdown
Member

Cherrypick #1907 into containerd 1.0.

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

Signed-off-by: Lantao Liu <[email protected]>
@Random-Liu Random-Liu changed the title Fix containerd deadlock. [Cherrypick] Fix containerd deadlock. Dec 12, 2017
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #1913 into release/1.0 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.0    #1913   +/-   ##
============================================
  Coverage        50.66%   50.66%           
============================================
  Files               81       81           
  Lines             7159     7159           
============================================
  Hits              3627     3627           
  Misses            2849     2849           
  Partials           683      683
Flag Coverage Δ
#linux 50.66% <ø> (ø) ⬆️

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 2689c98...de5beee. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit dba5fa0 into containerd:release/1.0 Dec 13, 2017
@Random-Liu Random-Liu deleted the cherry-pick-#1907 branch December 13, 2017 17:38
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