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

🌱 Bump corefile-migration library to v1.0.21 #9307

Merged
merged 1 commit into from
Aug 25, 2023
Merged

🌱 Bump corefile-migration library to v1.0.21 #9307

merged 1 commit into from
Aug 25, 2023

Conversation

sbueringer
Copy link
Member

Signed-off-by: Stefan Büringer [email protected]

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

@sbueringer sbueringer added the area/dependency Issues or PRs related to dependency changes label Aug 25, 2023
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 25, 2023
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 25, 2023
@sbueringer
Copy link
Member Author

Let's get this merged before the releases next week

@sbueringer
Copy link
Member Author

/cherry-pick release-1.5

@k8s-infra-cherrypick-robot
Copy link

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.5 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.5

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.

@sbueringer
Copy link
Member Author

/cherry-pick release-1.4

@k8s-infra-cherrypick-robot
Copy link

@sbueringer: once the present PR merges, I will cherry-pick it on top of release-1.4 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.4

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.

killianmuldoon
killianmuldoon reviewed Aug 25, 2023
View reviewed changes
Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 25, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: e729e5f882c1e63900b1432f92e37aa8194375bc

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: killianmuldoon

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 25, 2023
@k8s-ci-robot k8s-ci-robot merged commit 0270e04 into kubernetes-sigs:main Aug 25, 2023
@k8s-ci-robot k8s-ci-robot added this to the v1.6 milestone Aug 25, 2023
@k8s-infra-cherrypick-robot
Copy link

@sbueringer: #9307 failed to apply on top of branch "release-1.5":

Applying: Bump corefil-migration library to v1.0.21
Using index info to reconstruct a base tree...
M	docs/book/src/reference/versions.md
M	go.mod
M	go.sum
M	hack/tools/go.mod
M	hack/tools/go.sum
M	test/go.mod
M	test/go.sum
Falling back to patching base and 3-way merge...
Auto-merging test/go.sum
Auto-merging test/go.mod
CONFLICT (content): Merge conflict in test/go.mod
Auto-merging hack/tools/go.sum
Auto-merging hack/tools/go.mod
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging docs/book/src/reference/versions.md
CONFLICT (content): Merge conflict in docs/book/src/reference/versions.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump corefil-migration library to v1.0.21
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.5

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.

@k8s-infra-cherrypick-robot
Copy link

@sbueringer: #9307 failed to apply on top of branch "release-1.4":

Applying: Bump corefil-migration library to v1.0.21
Using index info to reconstruct a base tree...
M	docs/book/src/reference/versions.md
M	go.mod
M	go.sum
M	hack/tools/go.mod
M	hack/tools/go.sum
M	test/go.mod
M	test/go.sum
Falling back to patching base and 3-way merge...
Auto-merging test/go.sum
Auto-merging test/go.mod
CONFLICT (content): Merge conflict in test/go.mod
Auto-merging hack/tools/go.sum
Auto-merging hack/tools/go.mod
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging docs/book/src/reference/versions.md
CONFLICT (content): Merge conflict in docs/book/src/reference/versions.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump corefil-migration library to v1.0.21
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.4

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.

@furkatgofurov7
Copy link
Member

/lgtm

@sbueringer sbueringer deleted the pr-bump-core-mi branch August 25, 2023 12:50
This was referenced Aug 25, 2023
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@killianmuldoon killianmuldoon killianmuldoon left review comments

@elmiko elmiko Awaiting requested review from elmiko

@richardcase richardcase Awaiting requested review from richardcase

Assignees

@killianmuldoon killianmuldoon

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dependency Issues or PRs related to dependency changes cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.6
Development

Successfully merging this pull request may close these issues.
5 participants
@sbueringer @k8s-infra-cherrypick-robot @k8s-ci-robot @furkatgofurov7 @killianmuldoon