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)
commitb3e8a483835334becbef9cba2bebbcf08df47c15
tree25520bcf5be30beff2db3971112c483c4888a219
parent5f6738f134e1abb359fc8e8c61751263db88d4b6
parent9359659d79a0c17265ff8a09e896920243a1b800
Merge branch '12902-queued-to-cancelled'

refs #12902

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