Skip to content

[release/1.6] Update go-cni to v1.1.5 backported due to conflict in go.mod#6877

Merged
mikebrow merged 1 commit intocontainerd:release/1.6from
MikeZappa87:update-go-cni-v2
Apr 28, 2022
Merged

[release/1.6] Update go-cni to v1.1.5 backported due to conflict in go.mod#6877
mikebrow merged 1 commit intocontainerd:release/1.6from
MikeZappa87:update-go-cni-v2

Conversation

@MikeZappa87
Copy link
Copy Markdown
Member

Cherry-pick #6868

Signed-off-by: Michael Zappa [email protected]
(cherry picked from commit 5d07303)

@k8s-ci-robot
Copy link
Copy Markdown

Hi @MikeZappa87. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Signed-off-by: Michael Zappa <[email protected]>
(cherry picked from commit 5d07303)
Signed-off-by: Michael Zappa <[email protected]>
@estesp estesp changed the title Update go-cni to v1.1.5 backported due to conflict in go.mod [release/1.6] Update go-cni to v1.1.5 backported due to conflict in go.mod Apr 28, 2022
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

@estesp
Copy link
Copy Markdown
Member

estesp commented Apr 28, 2022

/ok-to-test

Copy link
Copy Markdown
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 6eeeaad into containerd:release/1.6 Apr 28, 2022
@MikeZappa87 MikeZappa87 deleted the update-go-cni-v2 branch September 9, 2022 14:49
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.

4 participants