Merge branch 'master' into 8857-cwl-job-reuse
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 1 Apr 2016 14:01:39 +0000 (10:01 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 1 Apr 2016 14:01:39 +0000 (10:01 -0400)
commit3386dd9826cf143d078aa8985726516932fafa5b
tree0b4d81c4ef0eb5bc784a503eae71cb206ccd14bd
parent92c876d90253a0db23d40aa125cba335f7bf7e27
parent9bf2ba202652163937d79341e855910f8c330d05
Merge branch 'master' into 8857-cwl-job-reuse

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