13959: Merge branch 'master' into 13959-timeouts-and-logging
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 24 Aug 2018 16:06:18 +0000 (12:06 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 24 Aug 2018 16:06:18 +0000 (12:06 -0400)
commit516d126f71ecdb05f3ebac781d2518634d16209f
treeb633c48300dea06de1fd8cbd31dedac0f046f11e
parent3ae5b174a710fca21895a1ad7273b6f61bf9ac1e
parente73008e45f0c67d26bd4e05c932de4c9d4431575
13959: Merge branch 'master' into 13959-timeouts-and-logging

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