Skip to content

[release/1.2 backport] Fix race and panic.#3147

Merged
estesp merged 1 commit intocontainerd:release/1.2from
Random-Liu:cherrypick-#3137-release-1.2
Mar 29, 2019
Merged

[release/1.2 backport] Fix race and panic.#3147
estesp merged 1 commit intocontainerd:release/1.2from
Random-Liu:cherrypick-#3137-release-1.2

Conversation

@Random-Liu
Copy link
Copy Markdown
Member

This backports #3137 to fix the WithAllCapabilities race condition.

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

Signed-off-by: Lantao Liu <[email protected]>
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3147 into release/1.2 will increase coverage by 0.01%.
The diff coverage is 100%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release/1.2    #3147      +/-   ##
===============================================
+ Coverage        43.75%   43.76%   +0.01%     
===============================================
  Files              101      101              
  Lines            10736    10738       +2     
===============================================
+ Hits              4697     4699       +2     
  Misses            5309     5309              
  Partials           730      730
Flag Coverage Δ
#linux 47.39% <100%> (+0.01%) ⬆️
#windows 40.85% <100%> (+0.01%) ⬆️
Impacted Files Coverage Δ
oci/spec_opts.go 20.99% <100%> (+0.21%) ⬆️

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 667ff6a...de1b991. Read the comment docs.

Copy link
Copy Markdown
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

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

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM (not a maintainer)

@estesp estesp merged commit 5066e51 into containerd:release/1.2 Mar 29, 2019
@Random-Liu Random-Liu deleted the cherrypick-#3137-release-1.2 branch March 29, 2019 16:35
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.

5 participants