From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 2 Nov 2015 22:47:10 +0000 (+0000)
Subject: Merge "Convert SiteStatsUpdate to using getMainStashInstance()"
X-Git-Tag: 1.31.0-rc.0~9142
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/categories/modifier.php?a=commitdiff_plain;h=dad19d999cf5cc249dacd390a775ef2f56649b86;p=lhc%2Fweb%2Fwiklou.git

Merge "Convert SiteStatsUpdate to using getMainStashInstance()"
---

dad19d999cf5cc249dacd390a775ef2f56649b86
diff --cc includes/objectcache/ObjectCache.php
index 09123507a9,27d8802596..217b61fa8c
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@@ -56,17 -63,9 +56,17 @@@ use MediaWiki\Logger\LoggerFactory
   *   Purpose: Memory storage for per-cluster coordination and tracking.
   *   A typical use case would be a rate limit counter or cache regeneration mutex.
   *   Stored centrally within the local data-center. Not replicated to other DCs.
-  *   Also known as $wgMemc. Configured by $wgMainCacheType.
+  *   Configured by $wgMainCacheType.
   *
 - * - wfGetCache( $cacheType )
 + * - ObjectCache::getMainStashInstance()
 + *   Purpose: Ephemeral global storage.
 + *   Stored centrally within the primary data-center.
 + *   Changes are applied there first and replicated to other DCs (best-effort).
 + *   To retrieve the latest value (e.g. not from a slave), use BagOStuff:READ_LATEST.
 + *   This store may be subject to LRU style evictions.
 + *
 + * - ObjectCache::getInstance( $cacheType )
 + *   Purpose: Special cases (like tiered memory/disk caches).
   *   Get a specific cache type by key in $wgObjectCaches.
   *
   * All the above cache instances (BagOStuff and WANObjectCache) have their makeKey()