Merge branch 'master' into 9307-cwl-use-tmp-output
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 6 Oct 2016 15:34:34 +0000 (11:34 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 6 Oct 2016 15:34:34 +0000 (11:34 -0400)
commite68177bfa8de36bd54f705e16e5c4854eafb29a2
treef5a21e4fcca4e44764309bac7edb0253cb1f62e0
parenta3562a62e6b23035543f08226479813d5d1c31ed
parentd5cc11240819c79a14197a37489964e0adf173be
Merge branch 'master' into 9307-cwl-use-tmp-output

Conflicts:
sdk/cwl/tests/test_job.py
sdk/cwl/arvados_cwl/arvjob.py
sdk/cwl/tests/test_job.py