13959: Merge branch 'master' into 13959-timeouts-and-logging
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 17 Aug 2018 14:38:39 +0000 (10:38 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 17 Aug 2018 14:38:39 +0000 (10:38 -0400)
commitf739d736bbb60a8463f04f5d56c18d09157d820e
treeb71612a2b6edcac313fd2d58e1228054172362aa
parent58044098495d066effa7fd4742b6635d9a10fdfb
parentd7b63b6901f31b8b9de89762cdf76aa9ae5b00b7
13959: Merge branch 'master' into 13959-timeouts-and-logging

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
sdk/go/dispatch/dispatch.go
services/crunch-dispatch-local/crunch-dispatch-local_test.go
services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go