Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ginkgo to match cri-tools' version #8758

Merged
merged 1 commit into from
Jun 28, 2023
Merged

Update ginkgo to match cri-tools' version #8758

merged 1 commit into from
Jun 28, 2023

Conversation

djdongjin
Copy link
Member

@djdongjin djdongjin commented Jun 28, 2023 •
edited
Loading

@djdongjin
Update ginkgo to match cri-tools' version
4df27fd 
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
@k8s-ci-robot
Copy link

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@djdongjin
Copy link
Member Author

/test all

@djdongjin djdongjin marked this pull request as ready for review June 28, 2023 13:18
@djdongjin djdongjin changed the title Update ginkgo to match cri-tools' version [WIP] Update ginkgo to match cri-tools' version Jun 28, 2023
@djdongjin djdongjin mentioned this pull request Jun 28, 2023
Merged
@djdongjin
Copy link
Member Author

/cc @thaJeztah

@k8s-ci-robot k8s-ci-robot requested a review from thaJeztah June 28, 2023 13:46
@djdongjin djdongjin changed the title [WIP] Update ginkgo to match cri-tools' version Update ginkgo to match cri-tools' version Jun 28, 2023
@thaJeztah thaJeztah added cherry-pick/1.6.x Change to be cherry picked to release/1.6 branch cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Jun 28, 2023
thaJeztah
thaJeztah approved these changes Jun 28, 2023
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM (assuming CI goes green)

Thank you!! I also added cherry-pick labels (assuming that the release branches also run into this)

@kzys kzys merged commit 5d4504c into containerd:main Jun 28, 2023
This was referenced Jun 28, 2023
Merged
Merged
@thaJeztah thaJeztah added cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch and removed cherry-pick/1.6.x Change to be cherry picked to release/1.6 branch cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Jun 28, 2023
kiashok added a commit to kiashok/containerd-containerd that referenced this pull request Oct 23, 2024
@kiashok
Merged PR 8369437: Update fork-external/main with upstream containerd…
6b2c041 
…/main

Merge upstream containerd/main at commit 5d1ab01 into ado fork-external/main

Related work items: containerd#7944, containerd#8174, containerd#8334, containerd#8362, containerd#8572, containerd#8582, containerd#8588, containerd#8605, containerd#8606, containerd#8617, containerd#8619, containerd#8626, containerd#8627, containerd#8633, containerd#8637, containerd#8641, containerd#8643, containerd#8645, containerd#8652, containerd#8667, containerd#8672, containerd#8673, containerd#8676, containerd#8680, containerd#8684, containerd#8685, containerd#8692, containerd#8696, containerd#8697, containerd#8701, containerd#8708, containerd#8717, containerd#8726, containerd#8728, containerd#8729, containerd#8731, containerd#8732, containerd#8740, containerd#8752, containerd#8758, containerd#8762, containerd#8764
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@neersighted neersighted neersighted approved these changes

@kzys kzys kzys approved these changes

Assignees
No one assigned
Labels
cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@djdongjin @k8s-ci-robot @kzys @neersighted @thaJeztah