Merge "Make getLagFromPtHeartbeat() always use the LB cluster master entry"

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

Wed, 23 Dec 2015 23:27:30 +0000 (23:27 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 23 Dec 2015 23:27:30 +0000 (23:27 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 23 Dec 2015 23:27:30 +0000 (23:27 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 23 Dec 2015 23:27:30 +0000 (23:27 +0000)
diff --cc includes/db/DatabaseMysqlBase.php
Simple merge
diff --cc includes/db/loadbalancer/LoadBalancer.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 23 Dec 2015 23:27:30 +0000 (23:27 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 23 Dec 2015 23:27:30 +0000 (23:27 +0000)
		1	2
includes/db/DatabaseMysqlBase.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/db/loadbalancer/LoadBalancer.php	patch \|	diff1 \|	diff2 \|	blob \| history