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

NAS-130794 / 24.10-RC.1 / Fix Cloud Backup Restore Include From Subfolder (by denysbutenko) #10665

Merged
merged 2 commits into from
Sep 11, 2024

Conversation

bugclerk
Copy link
Contributor

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

git reset --hard HEAD~1
git cherry-pick -x 230ad4d68c98b933680f4f92b894eaa0b6a46ec8
git cherry-pick -x 362aa54513240399c0cbc2e303bebb0e5ab8d199
git cherry-pick -x f270c0b192923a03a045212062b4ce6269f2ff13
git cherry-pick -x 6cc233ecb64a89eaa46e34f1719fd48cbc0f956a
git cherry-pick -x fd6c5a5cfcd5c5503e8e3fad0954bd99dc440b4e
git cherry-pick -x ca586bacd30b2aa377f641dd40163480ef00c9e3
git cherry-pick -x b44bf5bab0683a8076170d105674585185c4528f
git cherry-pick -x ce7678279bb2136a4da87d4437ee1c40ef1e64a0

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 25da2b42caf62ae14295c0ca5fc368fabcaec821

Changes:

Fix Cloud Backup Restore Include From Subfolder

Testing:

Try to restore cloud backup with Include from subfolder option and use Included Paths.

Original PR: #10610
Jira URL: https://ixsystems.atlassian.net/browse/NAS-130794

Copy link
Collaborator

@undsoft undsoft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

backported

@undsoft undsoft marked this pull request as ready for review September 11, 2024 17:54
@undsoft undsoft requested a review from a team as a code owner September 11, 2024 17:54
@undsoft undsoft requested review from AlexKarpov98 and removed request for a team September 11, 2024 17:54
@undsoft undsoft enabled auto-merge (squash) September 11, 2024 17:54
@undsoft undsoft merged commit 021e574 into stable/electriceel Sep 11, 2024
5 checks passed
@undsoft undsoft deleted the NAS-130794-24.10-RC.1 branch September 11, 2024 18:30
@bugclerk
Copy link
Contributor Author

This PR has been merged and conversations have been locked.
If you would like to discuss more about this issue please use our forums or raise a Jira ticket.

@truenas truenas locked as resolved and limited conversation to collaborators Sep 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants