Skip to content

vendor: github.com/containerd/containerd v1.5.7#42994

Merged
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:bump_containerd
Nov 8, 2021
Merged

vendor: github.com/containerd/containerd v1.5.7#42994
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:bump_containerd

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Nov 5, 2021

full diff: containerd/containerd@v1.5.5...v1.5.7

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@thaJeztah
Copy link
Member Author

@tianon @samuelkarp @cpuguy83 PTAL (as discussed Yesterday)

Copy link
Member

@samuelkarp samuelkarp left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah
Copy link
Member Author

CI is green; failure is during Jenkins cleanup, which is tracked in #42974

@thaJeztah thaJeztah merged commit 9370ea2 into moby:master Nov 8, 2021
@thaJeztah thaJeztah deleted the bump_containerd branch November 8, 2021 09:29
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Nov 9, 2021
Possibly more dependencies need to be updated, and instead of this we should cherry-pick.
This is just a quick check "what would it look like if we bumped the version in this branch";

Updating to containerd 1.5

Last containerd update in 20.10 is moby@1f88736 (moby#41688)

- moby@ab1dd80 moby#42274
- moby@5761fca moby#42274
- moby@42ef2c5 moby#42276
- moby@6202322 moby#42254
- moby@7c1c123 moby#42249
- moby@84df737 moby#42636
- moby@4fc2d4d moby#42656
- moby@3d58d13 moby#42697
- moby@582ef29 moby#42994

Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Nov 9, 2021
Possibly more dependencies need to be updated, and instead of this we should cherry-pick.
This is just a quick check "what would it look like if we bumped the version in this branch";

Updating to containerd 1.5

Last containerd update in 20.10 is moby@1f88736 (moby#41688)

- moby@ab1dd80 moby#42274
- moby@5761fca moby#42274
- moby@42ef2c5 moby#42276
- moby@6202322 moby#42254
- moby@7c1c123 moby#42249
- moby@84df737 moby#42636
- moby@4fc2d4d moby#42656
- moby@3d58d13 moby#42697
- moby@582ef29 moby#42994

Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Mar 18, 2022
Possibly more dependencies need to be updated, and instead of this we should cherry-pick.
This is just a quick check "what would it look like if we bumped the version in this branch";

Updating to containerd 1.5

Last containerd update in 20.10 is moby@1f88736 (moby#41688)

- moby@ab1dd80 moby#42274
- moby@5761fca moby#42274
- moby@42ef2c5 moby#42276
- moby@6202322 moby#42254
- moby@7c1c123 moby#42249
- moby@84df737 moby#42636
- moby@4fc2d4d moby#42656
- moby@3d58d13 moby#42697
- moby@582ef29 moby#42994
- moby@458b4aa moby#43025

Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Mar 18, 2022
Possibly more dependencies need to be updated, and instead of this we should cherry-pick.
This is just a quick check "what would it look like if we bumped the version in this branch";

Updating to containerd 1.5

Last containerd update in 20.10 is moby@1f88736 (moby#41688)

- moby@ab1dd80 moby#42274
- moby@5761fca moby#42274
- moby@42ef2c5 moby#42276
- moby@6202322 moby#42254
- moby@7c1c123 moby#42249
- moby@84df737 moby#42636
- moby@4fc2d4d moby#42656
- moby@3d58d13 moby#42697
- moby@582ef29 moby#42994
- moby@458b4aa moby#43025

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants