Merge "Fixes to LocalFile::lock()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 5 Jul 2016 20:08:53 +0000 (20:08 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 5 Jul 2016 20:08:53 +0000 (20:08 +0000)
commit78c1c6de078e227bc5fab39a89abd3dfcbcf0bd0
tree7e0d74e7f0e10a19c7f56589cd8e36f1a6d023f4
parentef3fb7d02e52f203c6a6d50dcbd25e1cd11f8e78
parentd70b081011b8d3df55e5b0f114c7f8f526522a0b
Merge "Fixes to LocalFile::lock()"