13497: Merge branch 'master' into 13497-controller
authorTom Clegg <tclegg@veritasgenetics.com>
Tue, 19 Jun 2018 16:31:08 +0000 (12:31 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Tue, 19 Jun 2018 16:31:08 +0000 (12:31 -0400)
commit73ad2ee9af3b97c46293bdfc9e2925a67726b786
treef79257c5403f98825312facdfc0866ae7ddb2d99
parentfe561d69b42d55191d6d1f01d4f3cdcf1fc9faaa
parentaf3bfbb6126ebce381c52ced87fc8af372d84118
13497: Merge branch 'master' into 13497-controller

refs #13497

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