15345: Merge branch 'master' into 15345-kill-container-api
authorTom Clegg <tclegg@veritasgenetics.com>
Mon, 24 Jun 2019 15:25:49 +0000 (11:25 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 24 Jun 2019 15:25:49 +0000 (11:25 -0400)
commitecdc08f29a97a6127cd36c71cc56683f09907289
treef2742d8ed811e6933af7fc729b0405bd30fbd693
parent49717fb59156c2b276ccc2fde0b9f2de71e812a6
parent2f4429e623199b9820d2296cf3788300caa7394b
15345: Merge branch 'master' into 15345-kill-container-api

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