[Pkg-owncloud-commits] [owncloud] 29/165: Merge pull request #15616 from owncloud/enc_stream_copy

[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 aef6ecdbf1fbe748acb64bcf8d1abdf14ea51e97
Merge: f32d977 7d4b1b5
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Fri Apr 17 11:32:24 2015 +0200

    Merge pull request #15616 from owncloud/enc_stream_copy
    
    always create a new instance of the encryption module

 apps/encryption/appinfo/application.php   | 18 +++++++------
 apps/encryption/lib/crypto/encryption.php |  3 ++-
 lib/private/encryption/manager.php        | 42 ++++++++++++++-----------------
 lib/public/encryption/imanager.php        | 14 ++++++-----
 settings/admin.php                        |  8 +++---
 tests/lib/encryption/managertest.php      | 41 ++++++++++++++++--------------
 6 files changed, 66 insertions(+), 60 deletions(-)

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