[Pkg-owncloud-commits] [owncloud] 410/457: Merge pull request #16821 from owncloud/compare-and-delete-locking-watch

[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 de3ed8e077f028d66dacb9bc9330e283342f2c66
Merge: 433db48 a9ff242
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Mon Jun 15 14:09:06 2015 +0200

    Merge pull request #16821 from owncloud/compare-and-delete-locking-watch
    
    Compare and delete locking watch

 lib/private/lock/memcachelockingprovider.php       |  3 +-
 lib/private/memcache/apc.php                       |  2 +
 lib/private/memcache/arraycache.php                |  2 +
 .../memcache/{nullcache.php => cadtrait.php}       | 70 +++++++++-------------
 lib/private/memcache/memcached.php                 |  2 +
 lib/private/memcache/nullcache.php                 |  4 ++
 lib/private/memcache/redis.php                     | 46 +++++++++++++-
 lib/private/memcache/xcache.php                    |  2 +
 lib/public/imemcache.php                           | 10 ++++
 tests/lib/memcache/cache.php                       | 12 ++++
 10 files changed, 108 insertions(+), 45 deletions(-)

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