Skip to content
This repository has been archived by the owner on Mar 9, 2022. It is now read-only.

vendor: update containerd 01310155947cb6eec37dcae29742a165e56acb4a #1414

Merged
merged 1 commit into from
Mar 6, 2020

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah force-pushed the update_containerd branch from c15754e to 24cbca5 Compare March 5, 2020 22:49
@thaJeztah thaJeztah requested a review from mikebrow March 6, 2020 00:13
@thaJeztah
Copy link
Member Author

@mikebrow ptal 🤗 after this one is merged, I'll rebase #1413 (and after that's merged, update containerd/cri vendoring in containerd/containerd to bring them back in sync)

Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

@mikebrow mikebrow merged commit 5f0cbd5 into containerd:master Mar 6, 2020
@mikebrow mikebrow added the lgtm label Mar 6, 2020
@mikebrow
Copy link
Member

mikebrow commented Mar 6, 2020

@mikebrow ptal 🤗 after this one is merged, I'll rebase #1413 (and after that's merged, update containerd/cri vendoring in containerd/containerd to bring them back in sync)

@thaJeztah sounds good then a sanity check and consider if we are ready to move to go mod (gulp)

@thaJeztah thaJeztah deleted the update_containerd branch March 6, 2020 15:15
@thaJeztah
Copy link
Member Author

if we are ready to move to go mod (gulp)

Perhaps something to coordinate; I think go mod would make most sense if both containerd and this repository are using it. Vendoring would then also be easier without using "replace" rules (probably).

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants