[Pkg-owncloud-commits] [owncloud] 62/131: Merge pull request #17678 from owncloud/backport-encryption_migration_improvements-stable8.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 deeacacfae49be3496b2a67d845b28d264bf562a
Merge: d199fb4 ae1332e
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Fri Jul 17 11:58:06 2015 +0200

    Merge pull request #17678 from owncloud/backport-encryption_migration_improvements-stable8.1
    
    Backport encryption migration improvements stable8.1

 apps/encryption/command/migratekeys.php      |  2 ++
 apps/encryption/lib/keymanager.php           | 25 +++++++++++---
 apps/encryption/lib/migration.php            |  2 +-
 apps/encryption/tests/lib/KeyManagerTest.php | 50 ++++++++++++++++++++++++++--
 settings/controller/encryptioncontroller.php |  2 ++
 5 files changed, 73 insertions(+), 8 deletions(-)

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