[Pkg-owncloud-commits] [owncloud] 46/85: Merge pull request #8885 from owncloud/flock-stable6

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch 6.0
in repository owncloud.

commit 29119065862e65c756c9c42f04c831c7eeec0417
Merge: edced60 909913d
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Fri Jun 6 17:58:08 2014 +0200

    Merge pull request #8885 from owncloud/flock-stable6
    
    [stable6][WIP] Move Flock basics into stable6

 apps/files_encryption/hooks/hooks.php              |  6 +--
 apps/files_encryption/lib/proxy.php                |  9 ++---
 apps/files_encryption/tests/stream.php             |  6 +++
 apps/files_encryption/tests/webdav.php             |  9 ++++-
 .../connector/sabre/exception/filelocked.php       | 28 +++++++++++++
 lib/private/connector/sabre/file.php               | 21 +++++++---
 lib/private/files/filesystem.php                   |  4 +-
 lib/private/files/storage/common.php               |  9 +++++
 lib/private/files/storage/loader.php               |  4 +-
 lib/private/files/storage/local.php                | 14 ++++++-
 lib/private/files/storage/wrapper/wrapper.php      |  8 ++++
 lib/private/helper.php                             |  1 +
 lib/private/log/owncloud.php                       | 17 +++++++-
 lib/private/util.php                               |  2 +-
 lib/public/files/locknotacquiredexception.php      | 47 ++++++++++++++++++++++
 lib/public/files/storage.php                       | 11 +++++
 tests/lib/files/filesystem.php                     |  6 +--
 tests/lib/files/mount/mount.php                    |  2 +-
 tests/lib/util.php                                 |  2 +-
 19 files changed, 176 insertions(+), 30 deletions(-)

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