Merge branch 'master' into 9766-register-workflow
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 6 Sep 2016 16:07:51 +0000 (12:07 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 6 Sep 2016 16:07:51 +0000 (12:07 -0400)
commit374a802e502d044973fd21ca68d2f6ab707bd770
tree5b29ae4982214e01c41ce01ed18e303539d82483
parentd42022147d700c5c0363a4429ceb04567fcc0b3b
parent96cc8940e7926453f4728c5aec1374e7b99db201
Merge branch 'master' into 9766-register-workflow

Conflicts:
build/run-build-packages.sh
sdk/cwl/setup.py
sdk/cwl/tests/test_job.py
sdk/cwl/tests/test_container.py
sdk/cwl/tests/test_job.py