Skip to content

[release/1.2] Update cri to a92c40017473cbe0239ce180125f12669757e44f.#3092

Merged
crosbymichael merged 1 commit intocontainerd:release/1.2from
Random-Liu:update-cri-release-1.2
Mar 12, 2019
Merged

[release/1.2] Update cri to a92c40017473cbe0239ce180125f12669757e44f.#3092
crosbymichael merged 1 commit intocontainerd:release/1.2from
Random-Liu:update-cri-release-1.2

Conversation

@Random-Liu
Copy link
Copy Markdown
Member

@Random-Liu Random-Liu commented Mar 12, 2019

Bug fixes:

  • Fix a bug causes container start failure after in-place upgrade to containerd 1.2.4+ or 1.1.6+.

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

@Random-Liu Random-Liu force-pushed the update-cri-release-1.2 branch from 0a0b621 to 12f7633 Compare March 12, 2019 20:40
@estesp
Copy link
Copy Markdown
Member

estesp commented Mar 12, 2019

I know we are focused on the 1.2.5 release; but I assume we want this in [release/1.1] branch as well?

@Random-Liu
Copy link
Copy Markdown
Member Author

Random-Liu commented Mar 12, 2019

Yeah, will send an update soon. Want to unblock 1.2.5 first. :)

@codecov-io
Copy link
Copy Markdown

codecov-io commented Mar 12, 2019

Codecov Report

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

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.2    #3092   +/-   ##
============================================
  Coverage        43.75%   43.75%           
============================================
  Files              101      101           
  Lines            10736    10736           
============================================
  Hits              4697     4697           
  Misses            5309     5309           
  Partials           730      730
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 8f312e3...12f7633. Read the comment docs.

1 similar comment
@codecov-io
Copy link
Copy Markdown

codecov-io commented Mar 12, 2019

Codecov Report

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

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.2    #3092   +/-   ##
============================================
  Coverage        43.75%   43.75%           
============================================
  Files              101      101           
  Lines            10736    10736           
============================================
  Hits              4697     4697           
  Misses            5309     5309           
  Partials           730      730
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 8f312e3...12f7633. Read the comment docs.

@dmcgowan
Copy link
Copy Markdown
Member

dmcgowan commented Mar 12, 2019

LGTM

1 similar comment
@crosbymichael
Copy link
Copy Markdown
Member

crosbymichael commented Mar 12, 2019

LGTM

@crosbymichael crosbymichael merged commit 075e1ed into containerd:release/1.2 Mar 12, 2019
@Random-Liu Random-Liu deleted the update-cri-release-1.2 branch March 12, 2019 21:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@Random-Liu @estesp @codecov-io @dmcgowan @crosbymichael