Merge branch 'master' into 10194-cwl-version-skew
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 21 Oct 2016 14:15:10 +0000 (10:15 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 21 Oct 2016 14:15:10 +0000 (10:15 -0400)
commite8a76617eeec9429ddf7879048a310ba6e15e0d8
treeb29d37608d41aa74cdbc49ea310ab43b2596d255
parenta70a555fbd30524568a0e019df184468f28556f0
parent91dc5f1d7f5ad9eb2640f6089e2d0476cbf87c8e
Merge branch 'master' into 10194-cwl-version-skew

Conflicts:
sdk/cwl/tests/test_job.py
sdk/cwl/arvados_cwl/__init__.py
sdk/cwl/arvados_cwl/arvjob.py
sdk/cwl/arvados_cwl/runner.py
sdk/cwl/tests/test_job.py
sdk/cwl/tests/test_submit.py