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: disable clone for v2 volume (backport #3191) #3196

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 8, 2024

Which issue(s) this PR fixes:

longhorn/longhorn#9106

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 #3191 done by [Mergify](https://mergify.com).

Signed-off-by: Shuo Wu <[email protected]>
(cherry picked from commit 53aec34)
Remove this once v2 volume clone #9106 is implemented.

Signed-off-by: Shuo Wu <[email protected]>
(cherry picked from commit a3dbb45)

# Conflicts:
#	webhook/resources/volume/validator.go
@mergify mergify bot added the conflicts label Oct 8, 2024
Copy link
Author

mergify bot commented Oct 8, 2024

Cherry-pick of a3dbb45 has failed:

On branch mergify/bp/v1.7.x/pr-3191
Your branch is ahead of 'origin/v1.7.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit a3dbb45f.
  (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:   webhook/resources/volume/validator.go

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

@shuo-wu
Copy link
Contributor

shuo-wu commented Oct 8, 2024

Close this as the conflict is resolved in #3197

@shuo-wu shuo-wu closed this Oct 8, 2024
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