[ARVADOS] updated: d17af4d65f73bed848ec07d6f51947bac52d4529

[git at public.curoverse.com]

Summary of changes:
 services/nodemanager/arvnodeman/config.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

       via  d17af4d65f73bed848ec07d6f51947bac52d4529 (commit)
      from  9da8cfcc74e1b8da6d147215ec4c25a6ffea3ced (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit d17af4d65f73bed848ec07d6f51947bac52d4529
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Oct 6 09:17:54 2014 -0400

    Fixup cloud timeout typing.

diff --git a/services/nodemanager/arvnodeman/config.py b/services/nodemanager/arvnodeman/config.py
index ca85d29..d796cb7 100644
--- a/services/nodemanager/arvnodeman/config.py
+++ b/services/nodemanager/arvnodeman/config.py
@@ -80,7 +80,10 @@ class NodeManagerConfig(ConfigParser.SafeConfigParser):
     def new_cloud_client(self):
         module = importlib.import_module('arvnodeman.computenode.' +
                                          self.get('Cloud', 'provider'))
-        return module.ComputeNodeDriver(self.get_section('Cloud Credentials'),
+        auth_kwargs = self.get_section('Cloud Credentials')
+        if 'timeout' in auth_kwargs:
+            auth_kwargs['timeout'] = int(auth_kwargs['timeout'])
+        return module.ComputeNodeDriver(auth_kwargs,
                                         self.get_section('Cloud List'),
                                         self.get_section('Cloud Create'))
 

-----------------------------------------------------------------------


hooks/post-receive
--