dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "objectcache: Fix grammar error in BagOStuff::getWithToken doc"
[lhc/web/wiklou.git]
/
includes
/
libs
/
objectcache
/
BagOStuff.php
diff --git
a/includes/libs/objectcache/BagOStuff.php
b/includes/libs/objectcache/BagOStuff.php
index
6089aaa
..
5dfec6e
100644
(file)
--- a/
includes/libs/objectcache/BagOStuff.php
+++ b/
includes/libs/objectcache/BagOStuff.php
@@
-154,7
+154,7
@@
abstract class BagOStuff implements LoggerAwareInterface {
abstract protected function doGet( $key, $flags = 0 );
/**
- * @note: This method is only needed if
cas() is not is used for merge
()
+ * @note: This method is only needed if
merge() uses mergeViaCas
()
*
* @param string $key
* @param mixed $casToken