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

Bumpt etcdadm controller to v1.0.12 #2439

Merged
merged 1 commit into from
Aug 28, 2023

Conversation

g-gaston
Copy link
Member

Description of changes:
Include latest fixes.

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 Aug 28, 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 Aug 28, 2023
@d8660091
Copy link
Member

/LGTM

@g-gaston
Copy link
Member Author

/approve
/cherry-pick release-0.7

@eks-distro-pr-bot
Copy link
Contributor

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

In response to this:

/approve
/cherry-pick release-0.7

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.

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: g-gaston

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

@g-gaston
Copy link
Member Author

/cherry-pick release-0.17

@eks-distro-pr-bot
Copy link
Contributor

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

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.

@eks-distro-bot eks-distro-bot merged commit 0a97e2e into aws:main Aug 28, 2023
@eks-distro-pr-bot
Copy link
Contributor

@g-gaston: #2439 failed to apply on top of branch "release-0.7":

Applying: Bumpt etcdadm controller to v1.0.12
Using index info to reconstruct a base tree...
M	UPSTREAM_PROJECTS.yaml
A	projects/aws/etcdadm-controller/ATTRIBUTION.txt
A	projects/aws/etcdadm-controller/CHECKSUMS
A	projects/aws/etcdadm-controller/GIT_TAG
Falling back to patching base and 3-way merge...
Auto-merging projects/mrajashree/etcdadm-controller/ATTRIBUTION.txt
CONFLICT (content): Merge conflict in projects/mrajashree/etcdadm-controller/ATTRIBUTION.txt
CONFLICT (modify/delete): projects/aws/etcdadm-controller/GIT_TAG deleted in HEAD and modified in Bumpt etcdadm controller to v1.0.12. Version Bumpt etcdadm controller to v1.0.12 of projects/aws/etcdadm-controller/GIT_TAG left in tree.
CONFLICT (modify/delete): projects/aws/etcdadm-controller/CHECKSUMS deleted in HEAD and modified in Bumpt etcdadm controller to v1.0.12. Version Bumpt etcdadm controller to v1.0.12 of projects/aws/etcdadm-controller/CHECKSUMS left in tree.
Auto-merging UPSTREAM_PROJECTS.yaml
CONFLICT (content): Merge conflict in UPSTREAM_PROJECTS.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bumpt etcdadm controller to v1.0.12
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:

/approve
/cherry-pick release-0.7

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.

@eks-distro-pr-bot
Copy link
Contributor

@g-gaston: new pull request created: #2440

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.

4 participants