Bug 1086854 - Add timeout when locking operations
Merge pull request #5249 from jwhonce/stage_1086854

Merged by openshift-bot