Skip to content

[release/1.2 backport] fix killall when use pidnamespace#3274

Merged
estesp merged 1 commit intocontainerd:release/1.2from
thaJeztah:1.2_backport_pidnamespace
May 10, 2019
Merged

[release/1.2 backport] fix killall when use pidnamespace#3274
estesp merged 1 commit intocontainerd:release/1.2from
thaJeztah:1.2_backport_pidnamespace

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

Backport of #3149 for the 1.2 branch (only the first commit (cherry picked from commit fa5f744))

addresses moby/moby#38978

Signed-off-by: Lifubang <[email protected]>
(cherry picked from commit fa5f744)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Copy Markdown
Member Author

/cc @lifubang @fuweid

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3274 into release/1.2 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.2    #3274   +/-   ##
============================================
  Coverage        43.74%   43.74%           
============================================
  Files              101      101           
  Lines            10761    10761           
============================================
  Hits              4707     4707           
  Misses            5319     5319           
  Partials           735      735
Flag Coverage Δ
#linux 47.38% <ø> (ø) ⬆️
#windows 40.84% <ø> (ø) ⬆️

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 ea75cfc...1014235. 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 d0319ec into containerd:release/1.2 May 10, 2019
@thaJeztah thaJeztah deleted the 1.2_backport_pidnamespace branch May 10, 2019 21:58
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