From: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
Date: Fri, 1 Mar 2019 15:02:58 +0000 (-0500)
Subject: Merge branch '14885-ciso-and-conda-packaging-pr'
X-Git-Tag: 1.4.0~131
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/3af38eca348413c6f11f6526b2ee2ca7cb53e348

Merge branch '14885-ciso-and-conda-packaging-pr'

refs #14885

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
---

3af38eca348413c6f11f6526b2ee2ca7cb53e348