From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 12 May 2015 20:03:02 +0000 (+0000)
Subject: Merge "Removed executeReadyPeriodicTasks() method"
X-Git-Tag: 1.31.0-rc.0~11427
X-Git-Url: http://git.cyclocoop.org/%27-%20%20.%20url_absolue%28find_in_path%28%27spip_style.css%27%29%29%20%20%20.%20url_absolue%28find_in_path%28%27prive/spip_style.css%27%29%29%20.%20%27?a=commitdiff_plain;h=2e89500994aa26f54c64b817ace7db23f1236f83;p=lhc%2Fweb%2Fwiklou.git

Merge "Removed executeReadyPeriodicTasks() method"
---

2e89500994aa26f54c64b817ace7db23f1236f83
diff --cc includes/jobqueue/JobQueueFederated.php
index b86819e8fc,b6bb3010ce..a35ab84940
--- a/includes/jobqueue/JobQueueFederated.php
+++ b/includes/jobqueue/JobQueueFederated.php
@@@ -373,19 -373,15 +373,7 @@@ class JobQueueFederated extends JobQueu
  		$this->throwErrorIfAllPartitionsDown( $failed );
  	}
  
- 	protected function doGetPeriodicTasks() {
- 		$tasks = array();
- 		/** @var JobQueue $queue */
- 		foreach ( $this->partitionQueues as $partition => $queue ) {
- 			foreach ( $queue->getPeriodicTasks() as $task => $def ) {
- 				$tasks["{$partition}:{$task}"] = $def;
- 			}
- 		}
- 
- 		return $tasks;
- 	}
- 
  	protected function doFlushCaches() {
 -		static $types = array(
 -			'empty',
 -			'size',
 -			'acquiredcount',
 -			'delayedcount',
 -			'abandonedcount'
 -		);
 -
  		/** @var JobQueue $queue */
  		foreach ( $this->partitionQueues as $queue ) {
  			$queue->doFlushCaches();