Merge "objectcache: make BagOStuff::mergeViaLock() timeout more sensible"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 17 Jul 2018 01:09:25 +0000 (01:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 17 Jul 2018 01:09:25 +0000 (01:09 +0000)
commitdf6491f78bb62a7c8da01c67ae518572cafe4c5b
tree8a18642e29f78f7d758eddd226fc1e840dcc6134
parent2252838b4a0ea09d393c26281eae62ee8c5cda98
parentb8779134ed9a06a587e56f864fbcb803c8bcb374
Merge "objectcache: make BagOStuff::mergeViaLock() timeout more sensible"