Merge branch 'master' into 13822-nm-delayed-daemon
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Tue, 17 Jul 2018 14:26:29 +0000 (10:26 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Tue, 17 Jul 2018 14:27:05 +0000 (10:27 -0400)
commit6fe8e52020d421797306e5c6536afbcee761510a
tree299dbec026a926e97883903198403007396888fd
parent83d08d7ccbc622ec97948929c83fb91f96743ca2
parent843b4e5cf7727528fb5b45629030fd0d6a364ab7
Merge branch 'master' into 13822-nm-delayed-daemon

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
services/nodemanager/arvnodeman/computenode/driver/__init__.py
services/nodemanager/arvnodeman/computenode/driver/azure.py
services/nodemanager/arvnodeman/computenode/driver/ec2.py
services/nodemanager/arvnodeman/computenode/driver/gce.py
services/nodemanager/arvnodeman/daemon.py