Merge "Allow resources to be salvaged across service resets."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 19 May 2016 12:45:16 +0000 (12:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 19 May 2016 12:45:16 +0000 (12:45 +0000)
commit5fd224c00b940f75c1f83e56b99961be94bde70a
tree9f495483ac12fe7e6a6f892f806cea0d48e9ad3c
parent31dea468f00d8c0887f28c5d507f334179238cc0
parentbca436db920721302565801d47f370c17756de66
Merge "Allow resources to be salvaged across service resets."
autoload.php
includes/MediaWikiServices.php
includes/Setup.php
tests/phpunit/includes/MediaWikiServicesTest.php