Remove $wgDBClusterTimeout

Also added release notes that I forgot to include in
change I4b409ef

Change-Id: I9416c0dc7dea1c32c3e1f6d7177ee9bc4e34e1de

diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 746e0c7..40cc3b5 100644 (file)
--- 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 6d06c49..be3f3c3 100644 (file)
--- 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