From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 19 May 2016 12:45:16 +0000 (+0000)
Subject: Merge "Allow resources to be salvaged across service resets."
X-Git-Tag: 1.31.0-rc.0~6916
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=5fd224c00b940f75c1f83e56b99961be94bde70a;p=lhc%2Fweb%2Fwiklou.git

Merge "Allow resources to be salvaged across service resets."
---

5fd224c00b940f75c1f83e56b99961be94bde70a
diff --cc includes/MediaWikiServices.php
index d423212664,3d4841903c..4028aa2c44
--- a/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@@ -8,12 -8,11 +8,13 @@@ use GenderCache
  use GlobalVarConfig;
  use Hooks;
  use LBFactory;
 +use LinkCache;
  use Liuggio\StatsdClient\Factory\StatsdDataFactory;
  use LoadBalancer;
+ use MediaWiki\Services\SalvageableService;
  use MediaWiki\Services\ServiceContainer;
  use MWException;
 +use ObjectCache;
  use ResourceLoader;
  use SearchEngine;
  use SearchEngineConfig;
diff --cc tests/phpunit/includes/MediaWikiServicesTest.php
index a45c3ae290,cbb6059957..0e646ea793
--- a/tests/phpunit/includes/MediaWikiServicesTest.php
+++ b/tests/phpunit/includes/MediaWikiServicesTest.php
@@@ -1,7 -1,8 +1,9 @@@
  <?php
  use Liuggio\StatsdClient\Factory\StatsdDataFactory;
 +use MediaWiki\Interwiki\InterwikiLookup;
  use MediaWiki\MediaWikiServices;
+ use MediaWiki\Services\DestructibleService;
+ use MediaWiki\Services\SalvageableService;
  use MediaWiki\Services\ServiceDisabledException;
  
  /**