[Pkg-owncloud-commits] [owncloud] 240/457: Merge pull request #16237 from owncloud/file-locking

[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 2f8296875fad40328050e9cda0ef7f268f1afc09
Merge: 50b4204 2104c2f
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon Jun 1 16:37:38 2015 +0200

    Merge pull request #16237 from owncloud/file-locking
    
    High level file locking

 apps/files_sharing/lib/sharedstorage.php           |  37 ++++
 config/config.sample.php                           |  19 ++
 lib/base.php                                       |   2 +
 lib/private/connector/sabre/directory.php          |  17 +-
 .../connector/sabre/exception/filelocked.php       |   2 +-
 lib/private/connector/sabre/file.php               |  17 ++
 lib/private/connector/sabre/filesplugin.php        |   6 +
 lib/private/connector/sabre/objecttree.php         |  10 +-
 lib/private/files/storage/common.php               |  29 +++
 lib/private/files/storage/storage.php              |  23 +++
 lib/private/files/storage/wrapper/jail.php         |  29 +++
 lib/private/files/storage/wrapper/wrapper.php      |  29 +++
 lib/private/files/view.php                         | 199 ++++++++++++++++++++-
 lib/private/lock/memcachelockingprovider.php       |  58 +++++-
 .../nooplockingprovider.php}                       |  52 ++++--
 lib/private/memcache/factory.php                   |  23 ++-
 lib/private/memcache/null.php                      |  18 +-
 lib/private/server.php                             |  29 ++-
 lib/public/files/storage.php                       |  24 +++
 lib/public/iservercontainer.php                    |   8 +
 lib/public/lock/ilockingprovider.php               |  14 ++
 settings/admin.php                                 |   8 +
 settings/templates/admin.php                       |  37 ++--
 tests/lib/files/view.php                           |  27 +++
 tests/lib/lock/lockingprovider.php                 |  77 ++++++++
 tests/lib/testcase.php                             |   1 +
 26 files changed, 749 insertions(+), 46 deletions(-)

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