From f18bed451d12b31782936c69383ee01d10f1cf55 Mon Sep 17 00:00:00 2001 From: withoutaname Date: Thu, 12 Jun 2014 11:35:02 -0700 Subject: [PATCH] Remove $wgDBClusterTimeout Also added release notes that I forgot to include in change I4b409ef Change-Id: I9416c0dc7dea1c32c3e1f6d7177ee9bc4e34e1de --- RELEASE-NOTES-1.24 | 2 ++ includes/DefaultSettings.php | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 index 746e0c74fa..40cc3b570b 100644 --- a/RELEASE-NOTES-1.24 +++ b/RELEASE-NOTES-1.24 @@ -17,6 +17,8 @@ production. * $wgSearchEverythingOnlyLoggedIn was removed as the 'searcheverything' user option was removed. Use $wgNamespacesToBeSearchedDefault instead or if you used to have $wgDefaultUserOptions['searcheverything'] = 1. +* $wgMasterWaitTimeout has been deprecated. +* $wgDBClusterTimeout has been removed. === New features in 1.24 === * Added a new hook, "WhatLinksHereProps", to allow extensions to annotate diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 6d06c49c09..be3f3c3eea 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1739,11 +1739,6 @@ $wgDBerrorLog = false; */ $wgDBerrorLogTZ = false; -/** - * When to give an error message - */ -$wgDBClusterTimeout = 10; - /** * Scale load balancer polling time so that under overload conditions, the * database server receives a SHOW STATUS query at an average interval of this -- 2.20.1