[Pkg-owncloud-commits] [owncloud] 390/457: Merge pull request #16884 from owncloud/issue-16843-stop-locking-encryption-key-storage

[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 da96cbbcd4e3c81374ef51f52ab6a546db02c02d
Merge: abd7093 5586b2d
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Fri Jun 12 14:03:37 2015 +0200

    Merge pull request #16884 from owncloud/issue-16843-stop-locking-encryption-key-storage
    
    Do not lock the encryption key storage

 lib/private/files/view.php | 74 +++++++++++++++++++++++++++++++++++++------
 tests/lib/files/view.php   | 78 +++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 135 insertions(+), 17 deletions(-)

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