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.

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

bump git tag of eks-anywhere-packages #2521

Merged
merged 2 commits into from
Oct 2, 2023
Merged

Conversation

tatlat
Copy link
Member

@tatlat tatlat commented Sep 29, 2023

Issue #, if available:

Description of changes:

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@eks-distro-bot eks-distro-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 29, 2023
@eks-distro-bot eks-distro-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 29, 2023
Copy link
Contributor

@TerryHowe TerryHowe left a comment

Choose a reason for hiding this comment

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

/lgtm

@tatlat
Copy link
Member Author

tatlat commented Oct 2, 2023

/approve

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tatlat

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

@eks-distro-bot eks-distro-bot merged commit 018e542 into aws:main Oct 2, 2023
@d8660091
Copy link
Member

d8660091 commented Oct 5, 2023

/cherry-pick release-0.17

@eks-distro-pr-bot
Copy link
Contributor

@d8660091: #2521 failed to apply on top of branch "release-0.17":

Applying: bump git tag of eks-anywhere-packages
Using index info to reconstruct a base tree...
M	projects/aws/eks-anywhere-packages/GIT_TAG
Falling back to patching base and 3-way merge...
Auto-merging projects/aws/eks-anywhere-packages/GIT_TAG
CONFLICT (content): Merge conflict in projects/aws/eks-anywhere-packages/GIT_TAG
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 git tag of eks-anywhere-packages
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-0.17

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants