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

[stable29] fix: promote re-shares when deleting the parent share #49927

Merged
merged 11 commits into from
Dec 20, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Dec 19, 2024

Backport of PR #49629 (and #47425)

luka-nextcloud and others added 10 commits December 19, 2024 14:16
Note: Removed part about fix command from original PR

Signed-off-by: Luka Trovic <luka@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
(cherry picked from commit 42181c2)
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Canceling the previous add of deletion of invalid shares in
 transferownership because in some cases it deletes valid reshares, if
 incoming shares are not transfered on purpose.
Inverting the order of transfer between incoming and outgoing so that
 reshare can be migrated when incoming shares are transfered.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Co-authored-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
… but promoted

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@backportbot backportbot bot added the 3. to review Waiting for reviews label Dec 19, 2024
@backportbot backportbot bot added this to the Nextcloud 29.0.11 milestone Dec 19, 2024
@come-nc come-nc changed the title [stable29] [stable30] fix: promote re-shares when deleting the parent share [stable29] fix: promote re-shares when deleting the parent share Dec 19, 2024
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
Copy link
Contributor

come-nc commented Dec 19, 2024

/backport to stable28

@luka-nextcloud luka-nextcloud merged commit d7b4ec8 into stable29 Dec 20, 2024
181 checks passed
@luka-nextcloud luka-nextcloud deleted the backport/49629/stable29 branch December 20, 2024 06:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants