Merge branch 'master' into 8766-cwl-collection-project
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 23 Mar 2016 18:00:21 +0000 (14:00 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 23 Mar 2016 18:00:21 +0000 (14:00 -0400)
commita3d43ada117ee7e0535579fc3f1b66503f95b4c7
tree655b479a20364554c9c683c57e0cc24b03363010
parent8b133b596ef25d548e01820c25595803bb49d18e
parent4447bfa5edac893079894484244318a872a0d3ba
Merge branch 'master' into 8766-cwl-collection-project

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