From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Fri, 24 Aug 2018 16:06:56 +0000 (-0400)
Subject: Merge branch '13959-timeouts-and-logging'
X-Git-Tag: 1.2.0~10
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/794cecd80b3fc3c9812687fa9e4e269fb1e79c60

Merge branch '13959-timeouts-and-logging'

fixes #13959

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
---

794cecd80b3fc3c9812687fa9e4e269fb1e79c60