Merge "objectcache: Fix grammar error in BagOStuff::getWithToken doc"

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