Merge branch 'master' into 7478-anm-spot-instances
authorLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 11 Jun 2018 15:34:22 +0000 (12:34 -0300)
committerLucas Di Pentima <ldipentima@veritasgenetics.com>
Mon, 11 Jun 2018 15:34:22 +0000 (12:34 -0300)
commit8e31910034627dedd7259dd1e45a60768108c1e1
treeb66ec720b54e97de7a2bef4630f7260de7161b3a
parentd2efca1759c9e104f67d1caf85c8e62ff06807bd
parent85c13201abf4a9f19dd112992a04fa65da63369c
Merge branch 'master' into 7478-anm-spot-instances

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>
services/api/app/models/container_request.rb
services/nodemanager/arvnodeman/computenode/driver/azure.py
services/nodemanager/arvnodeman/config.py
services/nodemanager/arvnodeman/launcher.py
services/nodemanager/arvnodeman/test/fake_driver.py