Merge branch 'master' into 10081-cwl-run-same-job
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 23 Sep 2016 20:18:39 +0000 (16:18 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 23 Sep 2016 20:18:39 +0000 (16:18 -0400)
commit9bc524ae6d516f1be41cc8a7c6a76a96bbd9578c
treec897ffbf9371f495eec0815477abdaf94fd6a876
parent8b7d63024652c112973d4dd82f9a5d89cc624fc7
parentc858ed39886eceb69e54a7c7958aaf8fb4c5a27b
Merge branch 'master' into 10081-cwl-run-same-job

Conflicts:
sdk/cwl/arvados_cwl/runner.py
sdk/cwl/arvados_cwl/pathmapper.py
sdk/cwl/arvados_cwl/runner.py
sdk/cwl/setup.py