Merge branch 'master' into 10576-cwl-keep-fetcher
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 9 Dec 2016 19:20:28 +0000 (14:20 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 9 Dec 2016 19:20:28 +0000 (14:20 -0500)
commit0d62edcb9d25bf4dcdb20d8872ea7b438e12fc59
tree332b945cea97a79aaeca701dbbd27b8f7ec1dd08
parent13f7a114f9c03b1efa0d6f696a7f6034b6cc2677
parente336e28f4ce9c13aad98d059d2befb505bff365b
Merge branch 'master' into 10576-cwl-keep-fetcher

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