Merge branch '12902-queued-to-cancelled'
authorTom Clegg <tclegg@veritasgenetics.com>
Thu, 1 Feb 2018 16:51:40 +0000 (11:51 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Thu, 1 Feb 2018 16:51:40 +0000 (11:51 -0500)
refs #12902

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


Trivial merge