11121: Merge branch 'master' into 11121-crunch-output-collection-owner

[arvados.git] / services / nodemanager / arvnodeman / config.py

diff --git a/services/nodemanager/arvnodeman/config.py b/services/nodemanager/arvnodeman/config.py
index 30c82e70e19c1269858deba866bcc346412ba4a8..b54461c47d81b9f87bc1096da254cdf60e3f8aa9 100644 (file)
--- a/services/nodemanager/arvnodeman/config.py
+++ b/services/nodemanager/arvnodeman/config.py
@@ -45,7 +45,7 @@ class NodeManagerConfig(ConfigParser.SafeConfigParser):
                        'max_total_price': '0',
                        'boot_fail_after': str(sys.maxint),
                        'node_stale_after': str(60 * 60 * 2),
-                       'watchdog': 600},
+                       'watchdog': '600'},
             'Logging': {'file': '/dev/stderr',
                         'level': 'WARNING'},
         }.iteritems():