Merge branch '15946-collectionfs-deadlock'
authorTom Clegg <tom@tomclegg.ca>
Mon, 30 Dec 2019 15:16:42 +0000 (10:16 -0500)
committerTom Clegg <tom@tomclegg.ca>
Mon, 30 Dec 2019 15:16:42 +0000 (10:16 -0500)
fixes #15946

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>


Trivial merge