13959: Merge branch 'master' into 13959-timeouts-and-logging
authorTom Clegg <tclegg@veritasgenetics.com>
Tue, 21 Aug 2018 16:51:22 +0000 (12:51 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Tue, 21 Aug 2018 16:51:22 +0000 (12:51 -0400)
commit35bc168c5a98dbe3b97c4b3179b4834b78a5b72c
tree48cb17ac6a2d4fa30c3fa1cdecbbd10593e9c48b
parentf739d736bbb60a8463f04f5d56c18d09157d820e
parent067a7263a97e1b4d96ee6572e79884bdcd937bbf
13959: Merge branch 'master' into 13959-timeouts-and-logging

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