From: Tom Clegg <tom@curoverse.com>
Date: Thu, 13 Jul 2017 19:33:39 +0000 (-0400)
Subject: Merge branch '11948-cwl-conformance-fix'
X-Git-Tag: 1.1.0~136
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/a95c9948e04eab66cbb3aa4e93776c52956fc807

Merge branch '11948-cwl-conformance-fix'

refs #11948

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>
---

a95c9948e04eab66cbb3aa4e93776c52956fc807