[Pkg-owncloud-commits] [owncloud] 97/122: Merge pull request #15880 from owncloud/check_if_encryption_is_enabled

[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 f2d46693c6a7633c27db0b0cbe5dea57525d809e
Merge: 84960fe 83ed4ee
Author: Björn Schießle <bjoern at schiessle.org>
Date:   Wed May 6 13:23:55 2015 +0200

    Merge pull request #15880 from owncloud/check_if_encryption_is_enabled
    
    check if encryption is enbaled before we start moving keys

 lib/private/encryption/update.php                |  24 ++---
 lib/private/files/storage/wrapper/encryption.php |  53 ++++++-----
 tests/lib/files/storage/wrapper/encryption.php   | 109 ++++++++++++++---------
 3 files changed, 111 insertions(+), 75 deletions(-)

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