From ac926e5ac12a5c8b98b2b9f72c68d0730569d5dd Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 19 Aug 2015 17:26:22 -0700 Subject: [PATCH] Removed deprecated $wgMasterWaitTimeout; not used by LoadBalancer Change-Id: I2edd22ac1e414371b7c63f48e271abd033027b48 --- RELEASE-NOTES-1.26 | 1 + includes/DefaultSettings.php | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26 index 2774a27589..fd21c4c16b 100644 --- a/RELEASE-NOTES-1.26 +++ b/RELEASE-NOTES-1.26 @@ -25,6 +25,7 @@ production. * $wgResourceLoaderExperimentalAsyncLoading was deprecated and removed. This experimental feature was never enabled by default and is obsolete as of MediaWiki 1.26, in where ResourceLoader became fully asynchronous. +* $wgMasterWaitTimeout was removed (deprecated in 1.24). === New features in 1.26 === * (T51506) Now action=info gives estimates of actual watchers for a page. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index f1e8f44fda..de356adf4b 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1860,12 +1860,6 @@ $wgDBservers = false; */ $wgLBFactoryConf = array( 'class' => 'LBFactorySimple' ); -/** - * How long to wait for a slave to catch up to the master - * @deprecated since 1.24 - */ -$wgMasterWaitTimeout = 10; - /** * File to log database errors to */ -- 2.20.1