Merge "Allow floating point values for $wgJobBackoffThrottling"

[lhc/web/wiklou.git] / includes / DefaultSettings.php

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index cf94bae..e011d4a 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3621,6 +3621,8 @@ $wgTrackingCategories = array(
        'post-expand-template-inclusion-category',
        'hidden-category-category',
        'broken-file-category',
+       'node-count-exceeded-category',
+       'expansion-depth-exceeded-category',
 );
 
 /**
@@ -6184,6 +6186,7 @@ $wgJobTypesExcludedFromDefaultQueue = array( 'AssembleUploadChunks', 'PublishSta
  * may have a variable number of work items, as is the case with batch jobs.
  * This is used by runJobs.php and not jobs run via $wgJobRunRate.
  * These settings should be global to all wikis.
+ * @var float[]
  */
 $wgJobBackoffThrottling = array();