Merge branch 'master' into 10172-crunch2-container-output
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 20 Oct 2016 19:47:59 +0000 (15:47 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 20 Oct 2016 19:47:59 +0000 (15:47 -0400)
commit0e5198142fdba0ce2af6eb2852d45dff46ffb2e2
tree2a6ed0d1cfc5cc650412d4569e0a54c762f10ca5
parent3d984f3ee6182391094ece7e32d61c40be7ba903
parentd5524135b1495b919de332df4f952926664961f5
Merge branch 'master' into 10172-crunch2-container-output
sdk/cwl/arvados_cwl/__init__.py
services/api/test/fixtures/collections.yml