projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d984f3 d552413)
Merge branch 'master' into 10172-crunch2-container-output
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 20 Oct 2016 19:47:59 +0000 (15:47 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 20 Oct 2016 19:47:59 +0000 (15:47 -0400)
1  2 
sdk/cwl/arvados_cwl/__init__.py patch | diff1 | diff2 | blob | history
services/api/test/fixtures/collections.yml patch | diff1 | diff2 | blob | history

diff --cc sdk/cwl/arvados_cwl/__init__.py
Simple merge