From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Thu, 1 Feb 2018 16:51:40 +0000 (-0500)
Subject: Merge branch '12902-queued-to-cancelled'
X-Git-Tag: 1.1.3~4
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/b3e8a483835334becbef9cba2bebbcf08df47c15

Merge branch '12902-queued-to-cancelled'

refs #12902

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

b3e8a483835334becbef9cba2bebbcf08df47c15