Skip to content

[release/1.2] cherry-pick: Call CloseIO when stdin closes in ctr#3490

Merged
fuweid merged 1 commit intocontainerd:release/1.2from
estesp:cp3462
Aug 6, 2019
Merged

[release/1.2] cherry-pick: Call CloseIO when stdin closes in ctr#3490
fuweid merged 1 commit intocontainerd:release/1.2from
estesp:cp3462

Conversation

@estesp
Copy link
Copy Markdown
Member

@estesp estesp commented Aug 5, 2019

Cherry-pick/backport of #3462

Had to detangle logURI support in master to fix cherry-pick conflicts; otherwise a straight copy back to release/1.2

Signed-off-by: Michael Crosby [email protected]
Signed-off-by: Phil Estes [email protected]

Fixes containerd#2439

Signed-off-by: Michael Crosby <[email protected]>
Signed-off-by: Phil Estes <[email protected]>
@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@codecov-io
Copy link
Copy Markdown

Codecov Report

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

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.2    #3490   +/-   ##
============================================
  Coverage        43.66%   43.66%           
============================================
  Files              101      101           
  Lines            10816    10816           
============================================
  Hits              4723     4723           
  Misses            5357     5357           
  Partials           736      736
Flag Coverage Δ
#linux 47.25% <ø> (ø) ⬆️
#windows 40.78% <ø> (ø) ⬆️

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 becb04a...116e770. Read the comment docs.

1 similar comment
@codecov-io
Copy link
Copy Markdown

Codecov Report

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

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.2    #3490   +/-   ##
============================================
  Coverage        43.66%   43.66%           
============================================
  Files              101      101           
  Lines            10816    10816           
============================================
  Hits              4723     4723           
  Misses            5357     5357           
  Partials           736      736
Flag Coverage Δ
#linux 47.25% <ø> (ø) ⬆️
#windows 40.78% <ø> (ø) ⬆️

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 becb04a...116e770. 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

@fuweid fuweid merged commit 6e4353d into containerd:release/1.2 Aug 6, 2019
@fuweid fuweid added this to the 1.2.8 milestone Aug 6, 2019
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