Skip to content

feat(kubeovn-operator): update Kube-OVN upstream to v1.15.4 (backport #236)#237

Merged
starbops merged 1 commit intov1.8from
mergify/bp/v1.8/pr-236
Mar 18, 2026
Merged

feat(kubeovn-operator): update Kube-OVN upstream to v1.15.4 (backport #236)#237
starbops merged 1 commit intov1.8from
mergify/bp/v1.8/pr-236

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Mar 18, 2026

Problem:

Solution:

Related Issue(s):

harvester/harvester#10089

Test plan:

Additional documentation or context


This is an automatic backport of pull request #236 done by [Mergify](https://mergify.com).

@mergify
Copy link
Copy Markdown
Author

mergify Bot commented Mar 18, 2026

Cherry-pick of 8bb6de7 has failed:

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

You are currently cherry-picking commit 8bb6de7.
  (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:   version_info

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

Signed-off-by: Zespre Chang <zespre.chang@suse.com>
(cherry picked from commit 8bb6de7)
@starbops starbops force-pushed the mergify/bp/v1.8/pr-236 branch from 027fd23 to 8a7e776 Compare March 18, 2026 08:35
@starbops
Copy link
Copy Markdown
Member

The conflict has been fixed.

@starbops starbops merged commit 6e93fee into v1.8 Mar 18, 2026
2 checks passed
@starbops starbops deleted the mergify/bp/v1.8/pr-236 branch March 18, 2026 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant