From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 20 Aug 2015 00:26:22 +0000 (-0700)
Subject: Removed deprecated $wgMasterWaitTimeout; not used by LoadBalancer
X-Git-Tag: 1.31.0-rc.0~10255^2
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=ac926e5ac12a5c8b98b2b9f72c68d0730569d5dd;p=lhc%2Fweb%2Fwiklou.git

Removed deprecated $wgMasterWaitTimeout; not used by LoadBalancer

Change-Id: I2edd22ac1e414371b7c63f48e271abd033027b48
---

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
  */