From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Mon, 12 Feb 2018 02:27:32 +0000 (-0500)
Subject: Merge branch '12840-cancelled-pipeline'
X-Git-Tag: 1.1.4~86
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/5d164d74505c232cfa232d69a56273da2d02b72a

Merge branch '12840-cancelled-pipeline'

fixes #12840

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

5d164d74505c232cfa232d69a56273da2d02b72a