Skip to content

feat: refactor v2 linked clone feature (backport #1404)#1405

Merged
derekbit merged 3 commits into
v1.12.xfrom
mergify/bp/v1.12.x/pr-1404
May 20, 2026
Merged

feat: refactor v2 linked clone feature (backport #1404)#1405
derekbit merged 3 commits into
v1.12.xfrom
mergify/bp/v1.12.x/pr-1404

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented May 20, 2026

Which issue(s) this PR fixes:

Issue longhorn/longhorn#12552

What this PR does / why we need it:

Special notes for your reviewer:

Additional documentation or context


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

@mergify
Copy link
Copy Markdown
Author

mergify Bot commented May 20, 2026

Cherry-pick of b7490f4 has failed:

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

You are currently cherry-picking commit b7490f43.
  (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:   vendor/github.com/longhorn/longhorn-spdk-engine/pkg/api/types.go
	modified:   vendor/github.com/longhorn/longhorn-spdk-engine/pkg/client/client_engine.go
	modified:   vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/engine.go
	modified:   vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/replica.go
	modified:   vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/server_engine.go
	modified:   vendor/github.com/longhorn/longhorn-spdk-engine/pkg/spdk/types.go
	modified:   vendor/github.com/longhorn/types/pkg/generated/imrpc/proxy.pb.go
	modified:   vendor/github.com/longhorn/types/pkg/generated/spdkrpc/spdk.pb.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   vendor/modules.txt

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

shuo-wu added 3 commits May 20, 2026 09:47
Longhorn 12552

Signed-off-by: Shuo Wu <shuo.wu@suse.com>
(cherry picked from commit b7490f4)
Longhorn 12552

Signed-off-by: Shuo Wu <shuo.wu@suse.com>
(cherry picked from commit afb7d6e)
And bump proxy API version to 7

Longhorn 12552

Signed-off-by: Shuo Wu <shuo.wu@suse.com>
(cherry picked from commit cca0104)
@derekbit derekbit force-pushed the mergify/bp/v1.12.x/pr-1404 branch from 501922e to c22ac92 Compare May 20, 2026 01:47
@derekbit derekbit merged commit 1196284 into v1.12.x May 20, 2026
12 checks passed
@derekbit derekbit deleted the mergify/bp/v1.12.x/pr-1404 branch May 20, 2026 01:55
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