Merge "Add the main stash, WAN, and server caches to MediaWikiServices"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 4 Oct 2016 21:45:12 +0000 (21:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 4 Oct 2016 21:45:12 +0000 (21:45 +0000)
1  2 
includes/MediaWikiServices.php
includes/ServiceWiring.php
tests/phpunit/includes/MediaWikiServicesTest.php

Simple merge
Simple merge