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.

Sign up for GitHub

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

Jump to bottom

NAS-132920 / 24.10.2 / New cloud backup option: `absolute_paths` (by AlexKarpov98) #11168

Draft

bugclerk wants to merge 1 commit into stable/electriceel from NAS-132920-24.10.2

Contributor

bugclerk commented Dec 11, 2024

Automatic cherry-pick failed. Please resolve conflicts by running:

git reset --hard HEAD~1
git cherry-pick -x 86caa83b5d196fabe966fd458ae4195eea9c74c9
git cherry-pick -x 0c5945b895fab4dc343e5e5b7a193f310afe35b2
git cherry-pick -x 96e65a98f2d389c9b32e1d3bfd93026358604b97

If the original PR was merged via a squash, you can just cherry-pick the squashed commit:

git reset --hard HEAD~1
git cherry-pick -x 3f625f8b4c16e268247b482c627737c5ded80760

Testing: see ticket.

Original PR: #11165
Jira URL: https://ixsystems.atlassian.net/browse/NAS-132920


          Empty commit to create PR on github.

dbf741e

You should reset it

bugclerk assigned AlexKarpov98

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet