Merge branch 'master' into 8654-arv-jobs-cwl-runner
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 28 Mar 2016 13:37:37 +0000 (09:37 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 28 Mar 2016 13:37:37 +0000 (09:37 -0400)
commit5c1410e60eb06769207dbafd77501bf2fa45a29b
treef732cc2503a6b65d74a634442d6010f208550d69
parent525e930dcb35b440424d53b09a9788fd8726b781
parent0e32c4ee6281dd4a3ae186b75dd7c94c8be508c8
Merge branch 'master' into 8654-arv-jobs-cwl-runner

Conflicts:
docker/jobs/Dockerfile
docker/jobs/Dockerfile