Merge "Make LocalFile file locking calls use Status::wrap"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 14 Jun 2018 15:44:18 +0000 (15:44 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 14 Jun 2018 15:44:18 +0000 (15:44 +0000)

Trivial merge