Merge "Add LoadBalancer::getMaintenanceConnectionRef() method"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Fri, 16 Dec 2016 03:22:45 +0000 (03:22 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 16 Dec 2016 03:22:45 +0000 (03:22 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 16 Dec 2016 03:22:45 +0000 (03:22 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 16 Dec 2016 03:22:45 +0000 (03:22 +0000)
diff --cc autoload.php
Simple merge
diff --cc tests/phpunit/MediaWikiTestCase.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 16 Dec 2016 03:22:45 +0000 (03:22 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 16 Dec 2016 03:22:45 +0000 (03:22 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
tests/phpunit/MediaWikiTestCase.php	patch \|	diff1 \|	diff2 \|	blob \| history