Merge branch '14885-ciso-and-conda-packaging-pr'
authorEric Biagiotti <ebiagiotti@veritasgenetics.com>
Fri, 1 Mar 2019 15:02:58 +0000 (10:02 -0500)
committerEric Biagiotti <ebiagiotti@veritasgenetics.com>
Fri, 1 Mar 2019 15:02:58 +0000 (10:02 -0500)
commit3af38eca348413c6f11f6526b2ee2ca7cb53e348
tree2a586b0251b11af6d70f729c569de88951003ef4
parenta310d114bdc06b20cd007e6aff14b409e1c11e32
parentd9e5d620d8e68b349bb79b9749a74110603a89d4
Merge branch '14885-ciso-and-conda-packaging-pr'

refs #14885

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
sdk/cwl/arvados_cwl/arvcontainer.py
sdk/python/arvados/collection.py