MDL-40903 fixed merge conflicts against integration

diff --git a/lib/db/caches.php b/lib/db/caches.php
index f2445e2..c6ca086 100644 (file)
--- a/lib/db/caches.php
+++ b/lib/db/caches.php
@@ -147,53 +147,6 @@ $definitions = array(
         'mode' => cache_store::MODE_APPLICATION,
         'simplekeys' => true,
         'simpledata' => true,
-        'staticacceleration' => true,
-        'staticaccelerationsize' => 2,
-    ),
-
-    // Cache used by the {@link plugininfo_mod} class.
-    'plugininfo_mod' => array(
-        'mode' => cache_store::MODE_APPLICATION,
-        'simplekeys' => true,
-        'simpledata' => true,
-        'staticacceleration' => true,
-        'staticaccelerationsize' => 1,
-    ),
-
-    // Cache used by the {@link plugininfo_block} class.
-    'plugininfo_block' => array(
-        'mode' => cache_store::MODE_APPLICATION,
-        'simplekeys' => true,
-        'simpledata' => true,
-        'staticacceleration' => true,
-        'staticaccelerationsize' => 1,
-    ),
-
-    // Cache used by the {@link plugininfo_filter} class.
-    'plugininfo_filter' => array(
-        'mode' => cache_store::MODE_APPLICATION,
-        'simplekeys' => true,
-        'simpledata' => true,
-        'staticacceleration' => true,
-        'staticaccelerationsize' => 1,
-    ),
-
-    // Cache used by the {@link plugininfo_repository} class.
-    'plugininfo_repository' => array(
-        'mode' => cache_store::MODE_APPLICATION,
-        'simplekeys' => true,
-        'simpledata' => true,
-        'staticacceleration' => true,
-        'staticaccelerationsize' => 1,
-    ),
-
-    // Cache used by the {@link plugininfo_portfolio} class.
-    'plugininfo_portfolio' => array(
-        'mode' => cache_store::MODE_APPLICATION,
-        'simplekeys' => true,
-        'simpledata' => true,
-        'staticacceleration' => true,
-        'staticaccelerationsize' => 1,
     ),
 
     // Used to store the full tree of course categories.