13497: Merge branch 'master' into 13497-controller
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 13 Jul 2018 20:30:48 +0000 (16:30 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 13 Jul 2018 20:30:48 +0000 (16:30 -0400)
commit50cbdcbd67f8b0da06d3b188e7bfdea3963661a7
treede09cd35400e658ffbdf28cacf96f2e4b710f1c0
parentf9a05f61abdf33891b09d62205d009d1cae73d1b
parentd640a546f2cd55cfbd0a959bcfb84be1eecdd6a6
13497: Merge branch 'master' into 13497-controller

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