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

fix(cve): support-bundle-kit (backport #7285) #7389

Merged
merged 1 commit into from
Dec 24, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 20, 2023

This is an automatic backport of pull request #7285 done by Mergify.
Cherry-pick of 875a5f2 has failed:

On branch mergify/bp/v1.4.x/pr-7285
Your branch is up to date with 'origin/v1.4.x'.

You are currently cherry-picking commit 875a5f2.
  (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)

Changes to be committed:
	modified:   chart/questions.yaml
	modified:   deploy/longhorn.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   chart/README.md
	both modified:   chart/values.yaml
	both modified:   deploy/longhorn-images.txt

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 Dec 20, 2023
@mergify mergify bot mentioned this pull request Dec 20, 2023
@c3y1huang
Copy link
Contributor

ref: #7280

ref: 7277

Signed-off-by: Chin-Ya Huang <chin-ya.huang@suse.com>
(cherry picked from commit 875a5f2)
@c3y1huang c3y1huang force-pushed the mergify/bp/v1.4.x/pr-7285 branch from ac3b3c3 to 9ad3f1f Compare December 20, 2023 05:41
@c3y1huang c3y1huang requested a review from a team December 20, 2023 05:42
@c3y1huang c3y1huang self-assigned this Dec 20, 2023
@innobead innobead merged commit d533e9f into v1.4.x Dec 24, 2023
4 checks passed
@innobead innobead deleted the mergify/bp/v1.4.x/pr-7285 branch December 24, 2023 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Closed
Development

Successfully merging this pull request may close these issues.

2 participants