Fix incomplete journal upgrade from 2.x to 3.x #2435
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
If this gets merged, I'd propose a backport to 3.0.1 and 3.0.0. |
|
Could you please rebase and squash the two commits? |
DominiqueFuchs
force-pushed
the
fix-journal-upgrade-multiple-syncconnections
branch
from
c8f9f90 to
2991171
Compare
|
/rebase |
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Remove awkward debug line a.k.a. whoops Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
er-vin
force-pushed
the
fix-journal-upgrade-multiple-syncconnections
branch
from
3fb31c5 to
d09b028
Compare
er-vin
approved these changes
Sep 16, 2020
|
AppImage file: Nextcloud-PR-2435-d09b0284dd6d655df63c103f6582934eab01c8c8-x86_64.AppImage |
|
/backport to stable-3.0 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Dominique Fuchs 32204802+DominiqueFuchs@users.noreply.github.com
Reason: Silly return within upgrade routine, breaking the overall folder iteration. Assuming this is caused because a "break" is indeed needed within this branch, but continue is the way to go here.
Fixes #2279