From f85a0c1e8bec3358e19db930e3814fc029eb1ff4 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Fri, 29 Jan 2016 12:09:56 -0800 Subject: [PATCH] Remove $wgDataCenterId/$wgDataCenterRoles These ended up not getting used after some patch changes Change-Id: I7c56d58972d1efcca6a249b7fb4d422a4006da88 --- RELEASE-NOTES-1.27 | 5 ++--- includes/DefaultSettings.php | 18 ------------------ 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27 index d9b6dd54da..ff2b22dfb8 100644 --- a/RELEASE-NOTES-1.27 +++ b/RELEASE-NOTES-1.27 @@ -96,9 +96,8 @@ production. class's methods. === New features in 1.27 === -* $wgDataCenterId and $wgDataCenterRoles where added, which will serve as - basic configuration settings needed for multi-datacenter setups. - $wgDataCenterUpdateStickTTL was also added. +* $wgDataCenterUpdateStickTTL was also added. This decides how long a user + sticks to the primary DC (via cookies) after they make changes to the site. * Added a new hook, 'UserMailerTransformContent', to transform the contents of an email. This is similar to the EmailUser hook but applies to all mail sent via UserMailer. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 4d0b50edd8..8431f87728 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1871,24 +1871,6 @@ $wgDBservers = false; */ $wgLBFactoryConf = array( 'class' => 'LBFactorySimple' ); -/** - * The ID of the current data center - * @since 1.27 - */ -$wgDataCenterId = 'default'; - -/** - * Map of data center IDs to their role ("master" or "slave") - * - * Multiple data centers can be setup to handle MediaWiki, with HTTP - * POSTs routed to the master data center and GET/HEAD/OPTION routed to - * any data center (usually the closest to the end user). In such setups, - * this setting should be set to the appropriate value in the site - * config for each data center. - * @since 1.27 - */ -$wgDataCenterRoles = array( 'default' => 'master' ); - /** * After a state-changing request is done by a client, this determines * how many seconds that client should keep using the master datacenter. -- 2.20.1