Merge "Cleaned up LoadBalancer::getConnection"

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

Fri, 12 Dec 2014 02:47:39 +0000 (02:47 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 12 Dec 2014 02:47:39 +0000 (02:47 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 12 Dec 2014 02:47:39 +0000 (02:47 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 12 Dec 2014 02:47:39 +0000 (02:47 +0000)
diff --cc includes/GlobalFunctions.php
Simple merge
diff --cc includes/db/LoadBalancer.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 12 Dec 2014 02:47:39 +0000 (02:47 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 12 Dec 2014 02:47:39 +0000 (02:47 +0000)
		1	2
includes/GlobalFunctions.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/db/LoadBalancer.php	patch \|	diff1 \|	diff2 \|	blob \| history