Merge branch '13497-controller'
authorTom Clegg <tclegg@veritasgenetics.com>
Fri, 13 Jul 2018 20:31:11 +0000 (16:31 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Fri, 13 Jul 2018 20:31:11 +0000 (16:31 -0400)
commitdb5107dca09b786374f06a35abb51ffc3f032abd
treede09cd35400e658ffbdf28cacf96f2e4b710f1c0
parentd640a546f2cd55cfbd0a959bcfb84be1eecdd6a6
parent50cbdcbd67f8b0da06d3b188e7bfdea3963661a7
Merge branch '13497-controller'

refs #13497

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