Merge "Make revision deletion acquire file locks to avoid races"

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

Wed, 27 Jul 2016 00:47:03 +0000 (00:47 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 27 Jul 2016 00:47:03 +0000 (00:47 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 27 Jul 2016 00:47:03 +0000 (00:47 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 27 Jul 2016 00:47:03 +0000 (00:47 +0000)
diff --cc includes/filerepo/file/LocalFile.php
Simple merge
diff --cc includes/revisiondelete/RevDelList.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 27 Jul 2016 00:47:03 +0000 (00:47 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 27 Jul 2016 00:47:03 +0000 (00:47 +0000)
		1	2
includes/filerepo/file/LocalFile.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/revisiondelete/RevDelList.php	patch \|	diff1 \|	diff2 \|	blob \| history