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 vmdp image (backport #551) #554

Closed
wants to merge 1 commit into from
Closed

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 3, 2023

This is an automatic backport of pull request #551 done by Mergify.
Cherry-pick of 5985d97 has failed:

On branch mergify/bp/v1.1/pr-551
Your branch is up to date with 'origin/v1.1'.

You are currently cherry-picking commit 5985d97.
  (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:   scripts/images/harvester-additional-images.txt

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/github/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

@mergify mergify bot added the conflicts label Aug 3, 2023
@mergify mergify bot mentioned this pull request Aug 3, 2023
(cherry picked from commit 5985d97)
@bk201
Copy link
Member

bk201 commented Nov 1, 2023

Close, the image is updated in #577

@bk201 bk201 closed this Nov 1, 2023
@mergify mergify bot deleted the mergify/bp/v1.1/pr-551 branch November 1, 2023 10:05
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.

2 participants