Skip to content

[release/1.1 backport] Update runc to 96ec2177ae841256168fcf76954f7177af#2864

Merged
crosbymichael merged 1 commit intocontainerd:release/1.1from
thaJeztah:1.1_backport_runc-kill-paused
Dec 7, 2018
Merged

[release/1.1 backport] Update runc to 96ec2177ae841256168fcf76954f7177af#2864
crosbymichael merged 1 commit intocontainerd:release/1.1from
thaJeztah:1.1_backport_runc-kill-paused

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

backport of #2857 for the 1.1 branch.
minor conflict in vendor.conf, but trivial to resolve.

This fixes a regression in runc that didn't allow signals being sent to
paused containers.

@thaJeztah
Copy link
Copy Markdown
Member Author

@crosbymichael @estesp ptal

@estesp
Copy link
Copy Markdown
Member

estesp commented Dec 7, 2018

The vndr run double-check during CI doesn't think the changes match?

These files were modified:
 M vendor/github.com/opencontainers/runc/libcontainer/configs/config.go
The command "script/validate/vendor" exited with 1.

@thaJeztah
Copy link
Copy Markdown
Member Author

ouch; thought about re-running vndr, but didn't do that 😊 let me fix that

This fixes a regression in runc that didn't allow signals being sent to
paused containers.

Signed-off-by: Michael Crosby <[email protected]>
(cherry picked from commit 66c20f2)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the 1.1_backport_runc-kill-paused branch from 1d0a825 to a1bfd3a Compare December 7, 2018 19:59
@thaJeztah
Copy link
Copy Markdown
Member Author

updated; let's see if it goes green now 👍

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

@codecov-io
Copy link
Copy Markdown

Codecov Report

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

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.1    #2864   +/-   ##
============================================
  Coverage        48.99%   48.99%           
============================================
  Files               85       85           
  Lines             7603     7603           
============================================
  Hits              3725     3725           
  Misses            3203     3203           
  Partials           675      675
Flag Coverage Δ
#linux 48.99% <ø> (ø) ⬆️

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 dbf186d...a1bfd3a. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@crosbymichael crosbymichael merged commit 0bb672d into containerd:release/1.1 Dec 7, 2018
@thaJeztah thaJeztah deleted the 1.1_backport_runc-kill-paused branch December 7, 2018 21:15
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