Merge "Removed executeReadyPeriodicTasks() method"

diff --cc includes/jobqueue/JobQueueDB.php
Simple merge

diff --cc includes/jobqueue/JobQueueFederated.php
index b86819e,b6bb301..a35ab84
--- 1/includes/jobqueue/JobQueueFederated.php
--- 2/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();

diff --cc includes/jobqueue/JobRunner.php
Simple merge