[Pkg-owncloud-commits] [owncloud] 164/457: Merge pull request #16501 from owncloud/enc_fix_move_versions_between_storages

[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 ded62ff69341bc96b673a0ab2cfda314c9af1bc8
Merge: 474c99e c63f228
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Thu May 28 15:28:25 2015 +0200

    Merge pull request #16501 from owncloud/enc_fix_move_versions_between_storages
    
    [encryption] fix move versions between storages

 lib/private/encryption/keys/storage.php          | 21 +++++--
 lib/private/encryption/manager.php               |  5 +-
 lib/private/files/storage/wrapper/encryption.php | 80 +++++++++++++++++-------
 tests/lib/encryption/keys/storage.php            | 40 ++++++++----
 tests/lib/files/storage/wrapper/encryption.php   | 49 +++++++++++++--
 5 files changed, 150 insertions(+), 45 deletions(-)


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