Merge branch 'master' into 13804-no-shutdown-wanted-nodes
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Tue, 17 Jul 2018 20:55:52 +0000 (16:55 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Tue, 17 Jul 2018 20:55:52 +0000 (16:55 -0400)
commit080c940d7a8134a6e277a53b7e45eb27e2b2c87f
tree5a5d5c16caf052678fc19a785c9c24f2b868dfa2
parenteef816fa8450fd3ce5388f4701ed888691ba897a
parent42012c4746d6dd81eb3c72fddb2fdd36cff381e7
Merge branch 'master' into 13804-no-shutdown-wanted-nodes

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
doc/install/install-nodemanager.html.textile.liquid
services/nodemanager/arvnodeman/computenode/dispatch/__init__.py
services/nodemanager/arvnodeman/config.py
services/nodemanager/arvnodeman/daemon.py
services/nodemanager/arvnodeman/launcher.py
services/nodemanager/doc/ec2.example.cfg
services/nodemanager/tests/integration_test.py
services/nodemanager/tests/test_computenode_dispatch.py
services/nodemanager/tests/test_daemon.py