Merge "Removed useless keys() function from BagOStuff."

diff --cc includes/objectcache/APCBagOStuff.php
Simple merge

diff --cc includes/objectcache/BagOStuff.php
index 32afe13,27b6dce..03b0d5b
--- 1/includes/objectcache/BagOStuff.php
--- 2/includes/objectcache/BagOStuff.php
+++ b/includes/objectcache/BagOStuff.php
@@@ -195,18 -92,10 +195,9 @@@ abstract class BagOStuff 
         * @return bool success
         */
        public function unlock( $key ) {
 -              /* stub */
 -              return true;
 +              return $this->delete( "{$key}:lock" );
        }
  
-       /**
-        * @todo: what is this?
-        * @return Array
-        */
-       public function keys() {
-               /* stub */
-               return array();
-       }
- 
        /**
         * Delete all objects expiring before a certain date.
         * @param $date string The reference date in MW format

diff --cc includes/objectcache/DBABagOStuff.php
Simple merge

diff --cc includes/objectcache/HashBagOStuff.php
Simple merge

diff --cc includes/objectcache/SqlBagOStuff.php
Simple merge

diff --cc includes/objectcache/WinCacheBagOStuff.php
Simple merge