Merge branch '8766-cwl-collection-project' into 8654-arv-jobs-cwl-runner
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 23 Mar 2016 14:52:38 +0000 (10:52 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 23 Mar 2016 14:52:38 +0000 (10:52 -0400)
commitbeaea7361fdfaf3dd220e3f5999fb3c0dfc3e61c
tree0bc8fd79606e564ba09adc7e2cccc59a5e835e4f
parentd170d92ce35f402b68fc07c7cbeed2d215685837
parent8b133b596ef25d548e01820c25595803bb49d18e
Merge branch '8766-cwl-collection-project' into 8654-arv-jobs-cwl-runner

Conflicts:
sdk/cwl/arvados_cwl/__init__.py
sdk/cwl/arvados_cwl/__init__.py