Merge "Deprecate wfWaitForSlaves() with LBFactory::waitForReplication()"

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

Wed, 20 Jan 2016 00:10:39 +0000 (00:10 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 20 Jan 2016 00:10:39 +0000 (00:10 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 20 Jan 2016 00:10:39 +0000 (00:10 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 20 Jan 2016 00:10:39 +0000 (00:10 +0000)
diff --cc autoload.php
Simple merge
diff --cc includes/GlobalFunctions.php
Simple merge
diff --cc includes/db/loadbalancer/LBFactory.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 20 Jan 2016 00:10:39 +0000 (00:10 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 20 Jan 2016 00:10:39 +0000 (00:10 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/GlobalFunctions.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/db/loadbalancer/LBFactory.php	patch \|	diff1 \|	diff2 \|	blob \| history