From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 5 Sep 2016 23:47:08 +0000 (+0000)
Subject: Merge "Change "slave" => "replica DB" in /includes"
X-Git-Tag: 1.31.0-rc.0~5759
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=9509503f51476fa9ae736db51402b2da52f5fc83;p=lhc%2Fweb%2Fwiklou.git

Merge "Change "slave" => "replica DB" in /includes"
---

9509503f51476fa9ae736db51402b2da52f5fc83
diff --cc includes/MediaWiki.php
index 35aa610732,e67a9b53d6..77a19691d6
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@@ -580,9 -580,9 +580,9 @@@ class MediaWiki 
  			$request->response()->setCookie( 'UseCDNCache', 'false', $expires, $options );
  		}
  
- 		// Avoid letting a few seconds of slave lag cause a month of stale data. This logic is
+ 		// Avoid letting a few seconds of replica DB lag cause a month of stale data. This logic is
  		// also intimately related to the value of $wgCdnReboundPurgeDelay.
 -		if ( $factory->laggedSlaveUsed() ) {
 +		if ( $factory->laggedReplicaUsed() ) {
  			$maxAge = $config->get( 'CdnMaxageLagged' );
  			$context->getOutput()->lowerCdnMaxage( $maxAge );
  			$request->response()->header( "X-Database-Lagged: true" );