projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a310d11 d9e5d62)
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)
refs #14885

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

1  2 
sdk/cwl/arvados_cwl/arvcontainer.py patch | diff1 | diff2 | blob | history
sdk/python/arvados/collection.py patch | diff1 | diff2 | blob | history

diff --cc sdk/cwl/arvados_cwl/arvcontainer.py
Simple merge
diff --cc sdk/python/arvados/collection.py
Simple merge