Merge "Made LocalFile::loadExtraFromDB() handle re-upload race conditions"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 24 Apr 2014 22:17:51 +0000 (22:17 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 24 Apr 2014 22:17:51 +0000 (22:17 +0000)
commit7b8af70f26c0ac6a3867a48afbf44815ef1f0636
tree07a700f273fecf57dd6d7662574353dd72faa841
parentde31b2474e29fe2f2eea6648b83d01ee53a726b7
parent3eced85d6009614594d2be7b7cd4998cf3cf229f
Merge "Made LocalFile::loadExtraFromDB() handle re-upload race conditions"
includes/filerepo/file/LocalFile.php