projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba15fa5 db0e7f5)
Merge branch '12934-cwl-conformance' refs #12934
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Wed, 17 Jan 2018 04:32:04 +0000 (23:32 -0500)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Wed, 17 Jan 2018 04:32:14 +0000 (23:32 -0500)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

1  2 
services/crunch-run/crunchrun.go patch | diff1 | diff2 | blob | history

diff --cc services/crunch-run/crunchrun.go
Simple merge