[Pkg-owncloud-commits] [owncloud] 265/457: Merge pull request #16667 from owncloud/issue-16510-fix-encryption-with-s2s-shares

[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 259937680b79044701331eed8bff98e3acd12e6c
Merge: 3ebc8f0 be1f319
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Jun 2 16:42:32 2015 +0200

    Merge pull request #16667 from owncloud/issue-16510-fix-encryption-with-s2s-shares
    
    Add tests for the storage wrapper and fix the wrapping

 lib/private/encryption/manager.php | 53 +++++++-------------------------------
 lib/private/encryption/util.php    | 51 ++++++++++++++++++++++++++++++++++++
 tests/lib/encryption/utiltest.php  | 45 ++++++++++++++++++++++++++++++++
 3 files changed, 106 insertions(+), 43 deletions(-)

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