[Pkg-owncloud-commits] [owncloud] 77/131: Merge pull request #17711 from owncloud/fix_repeated_migration_oc8.1

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v8.1.1
in repository owncloud.

commit ff8e63c991ba9d7a956ba637de6e8e86eb4bdfec
Merge: 6383bd3 777964f
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Mon Jul 20 13:58:20 2015 +0200

    Merge pull request #17711 from owncloud/fix_repeated_migration_oc8.1
    
    [8.1 backport] Don't mix up directories if the migration runs multiple times

 apps/encryption/appinfo/register_command.php |  3 +-
 apps/encryption/command/migratekeys.php      | 10 +++-
 apps/encryption/lib/migration.php            | 74 ++++++++++++++++++++++------
 apps/encryption/tests/lib/MigrationTest.php  | 49 ++++++++++++++++--
 settings/application.php                     |  3 +-
 settings/controller/encryptioncontroller.php | 10 +++-
 6 files changed, 124 insertions(+), 25 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git