Merge branch 'master' into 13773-will-fail-container-status
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Thu, 13 Sep 2018 20:05:48 +0000 (17:05 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Thu, 13 Sep 2018 20:06:13 +0000 (17:06 -0300)
commit30d37841e979eacd15f11cbaf608d507af379a86
tree088efc8a502e2b53bf3de21ec740eb5c5956d598
parent6451f2e4aa5464fa23fd8fe801177621702b8ac8
parent2b0b06579199967eca3d44d955ad64195d2db3c3
Merge branch 'master' into 13773-will-fail-container-status

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>
sdk/cwl/arvados_cwl/__init__.py
sdk/cwl/arvados_cwl/arvcontainer.py
services/api/app/models/container.rb
services/api/db/structure.sql