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

Sync from upstream - Set "minimum" tag in Makefile #119

Merged
merged 2 commits into from
Nov 29, 2022

Conversation

dhaiducek
Copy link
Contributor

Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
(cherry picked from commit af9170c4d21e240b17a74384033e1dc7de8d15a6)
Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
(cherry picked from commit 53bae7acbd8b1310aab4e3fbd5d84d4408244d42)
@sonarcloud
Copy link

sonarcloud bot commented Nov 29, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@openshift-ci
Copy link

openshift-ci bot commented Nov 29, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dhaiducek, JustinKuli

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:
  • OWNERS [JustinKuli,dhaiducek]

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

@openshift-merge-robot openshift-merge-robot merged commit 10c7a26 into stolostron:main Nov 29, 2022
@dhaiducek dhaiducek deleted the 118-manual-sync branch November 29, 2022 14:57
@dhaiducek
Copy link
Contributor Author

/cherry-pick release-2.6

@dhaiducek
Copy link
Contributor Author

/cherry-pick release-2.5

@openshift-cherrypick-robot

@dhaiducek: #119 failed to apply on top of branch "release-2.5":

Applying: Set "minimum" tag in Makefile
Using index info to reconstruct a base tree...
M	.github/workflows/kind.yml
M	Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging .github/workflows/kind.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Set "minimum" tag in Makefile
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-2.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.

@dhaiducek
Copy link
Contributor Author

/cherry-pick release-2.6

@openshift-cherrypick-robot

@dhaiducek: new pull request created: #121

In response to this:

/cherry-pick release-2.6

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

😿 Failed to sync the upstream PRs: #35
4 participants