Merge branch '8815-crunchrunner-everywhere' into 8654-arv-jobs-cwl-runner
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 29 Mar 2016 17:34:40 +0000 (13:34 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 29 Mar 2016 17:34:40 +0000 (13:34 -0400)
commit529a648458ceefc02d77abf470a2005a099d9907
tree0caa5522c5c9bcd1a08e3acff8d541681ad7a757
parent204bba7b53a2f7eba36782facf6dc8903aee120a
parent94f5be8c86ad975ee7aa9f3df87be23fbc154dec
Merge branch '8815-crunchrunner-everywhere' into 8654-arv-jobs-cwl-runner

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