Merge "Convert JobRunner to using beginMasterChanges()"

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

Wed, 7 Sep 2016 06:52:02 +0000 (06:52 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 7 Sep 2016 06:52:02 +0000 (06:52 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 7 Sep 2016 06:52:02 +0000 (06:52 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 7 Sep 2016 06:52:02 +0000 (06:52 +0000)
diff --cc includes/db/loadbalancer/LBFactory.php
Simple merge
diff --cc includes/db/loadbalancer/LoadBalancer.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 7 Sep 2016 06:52:02 +0000 (06:52 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 7 Sep 2016 06:52:02 +0000 (06:52 +0000)
		1	2
includes/db/loadbalancer/LBFactory.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/db/loadbalancer/LoadBalancer.php	patch \|	diff1 \|	diff2 \|	blob \| history