[Pkg-owncloud-commits] [owncloud] 247/457: Merge pull request #16200 from owncloud/kill-globalfilecache

[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 cf2c599218f01c1351cee2e4e48ee4b430f55287
Merge: baca5c6 e5a91fc
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Jun 2 09:11:33 2015 +0200

    Merge pull request #16200 from owncloud/kill-globalfilecache
    
    Drop file caching

 apps/user_ldap/lib/proxy.php          |  19 +++-
 lib/base.php                          |  14 ---
 lib/private/backgroundjob/joblist.php |   3 -
 lib/private/cache.php                 | 129 -------------------------
 lib/private/cache/broker.php          |  80 ----------------
 lib/private/cache/file.php            | 174 ----------------------------------
 lib/private/cache/fileglobal.php      | 107 ---------------------
 lib/private/cache/fileglobalgc.php    |  80 ----------------
 lib/private/cache/usercache.php       |  93 ------------------
 lib/private/repair.php                |   2 +
 lib/private/server.php                |  12 ++-
 lib/repair/dropoldjobs.php            |  78 +++++++++++++++
 tests/lib/cache/file.php              |  78 ---------------
 tests/lib/cache/fileglobalgc.php      | 107 ---------------------
 tests/lib/cache/usercache.php         |  74 ---------------
 tests/lib/repair/dropoldjobs.php      |  40 ++++++++
 16 files changed, 144 insertions(+), 946 deletions(-)

diff --cc lib/base.php
index 09159dc,c0ee3e8..77b0a89
--- a/lib/base.php
+++ b/lib/base.php
@@@ -652,9 -652,8 +652,8 @@@ class OC 
  			OC_User::setupBackends();
  		}
  
- 		self::registerCacheHooks();
  		self::registerFilesystemHooks();
 -		if (\OC::$server->getSystemConfig()->getValue('enable_previews', false)) {
 +		if (\OC::$server->getSystemConfig()->getValue('enable_previews', true)) {
  			self::registerPreviewHooks();
  		}	
  		self::registerShareHooks();
diff --cc lib/private/server.php
index aea5be5,f70106b..8113080
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@@ -43,10 -42,9 +42,11 @@@ use OC\Command\AsyncBus
  use OC\Diagnostics\NullQueryLogger;
  use OC\Diagnostics\EventLogger;
  use OC\Diagnostics\QueryLogger;
 +use OC\Lock\MemcacheLockingProvider;
 +use OC\Lock\NoopLockingProvider;
  use OC\Mail\Mailer;
  use OC\Memcache\ArrayCache;
+ use OC\Memcache\Null as NullCache;
  use OC\Http\Client\ClientService;
  use OC\Security\CertificateManager;
  use OC\Files\Node\Root;

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