[Pkg-owncloud-commits] [owncloud] 57/123: Merge pull request #16228 from owncloud/enc_fix_restore

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit fbe4b77c4946ea4be1ddb3886023f043b8d9eebe
Merge: b11c0c5 0d5c7a1
Author: Björn Schießle <bjoern at schiessle.org>
Date:   Tue May 12 13:10:16 2015 +0200

    Merge pull request #16228 from owncloud/enc_fix_restore
    
    use hooks to update encryption keys

 lib/base.php                                     |   2 +
 lib/private/encryption/hookmanager.php           |   8 ++
 lib/private/encryption/update.php                |  34 ++++++-
 lib/private/files/storage/wrapper/encryption.php |   8 +-
 tests/lib/encryption/updatetest.php              | 115 ++++++++++++++++++++++-
 tests/lib/files/storage/wrapper/encryption.php   |  11 +--
 6 files changed, 156 insertions(+), 22 deletions(-)

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