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.

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

[stable9.1] Fix unmerged shares repair targetdecision #25812

Merged
merged 2 commits into from
Aug 17, 2016
Merged

[stable9.1] Fix unmerged shares repair targetdecision #25812

merged 2 commits into from
Aug 17, 2016

Commits on Aug 16, 2016

  1. Improve file_target finding logic when repairing unmerged shares 

    Pick the most recent subshare that has no parenthesis from duplication
which should match whichever name the user picked last. If all
subshares have duplicate parenthesis names, use the least recent group
share's target instead.
    Vincent Petry committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    03a65e5 View commit details
    Browse the repository at this point in the history

  2. Fix unmerged shares repair with mixed group and direct shares 

    Whenever a group share is created after a direct share, the stime order
needs to be properly considered in the repair routine, considering that
the direct user share is appended to the $subShares array and breaking
its order.
    Vincent Petry committed Aug 16, 2016
    Configuration menu
    Copy the full SHA
    8cca364 View commit details
    Browse the repository at this point in the history