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 Rancherd to support Rancher v2.8.1 (backport #94) #95

Merged
merged 1 commit into from
Feb 2, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 2, 2024

This is an automatic backport of pull request #94 done by Mergify.
Cherry-pick of 4599efc has failed:

On branch mergify/bp/harvester-v1.2.x/pr-94
Your branch is up to date with 'origin/harvester-v1.2.x'.

You are currently cherry-picking commit 4599efc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Dockerfile

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 4599efc)
@FrankYang0529 FrankYang0529 force-pushed the mergify/bp/harvester-v1.2.x/pr-94 branch from 97a86db to fae0324 Compare February 2, 2024 06:26
@bk201 bk201 merged commit 0496647 into harvester-v1.2.x Feb 2, 2024
3 checks passed
@mergify mergify bot deleted the mergify/bp/harvester-v1.2.x/pr-94 branch February 2, 2024 07:03
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.

1 participant