[ARVADOS] updated: f94d59e86fe1e65c18cf905fa9ea1fcabfd1b1b5

[git at public.curoverse.com]

Summary of changes:
 sdk/python/arvados/keep.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

       via  f94d59e86fe1e65c18cf905fa9ea1fcabfd1b1b5 (commit)
       via  3da2281b33aa42a6885ee12d930843c3d43a1ffb (commit)
      from  624c5c8d13d6c2e21a80379928387944bedae2a3 (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 f94d59e86fe1e65c18cf905fa9ea1fcabfd1b1b5
Merge: 624c5c8 3da2281
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Apr 30 11:30:20 2015 -0400

    Merge branch '5562-pycurl' refs #5562


commit 3da2281b33aa42a6885ee12d930843c3d43a1ffb
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Apr 30 11:27:46 2015 -0400

    5562: Use static method. Fix "TypeError: _socket_open() takes exactly 5 arguments (4 given)".

diff --git a/sdk/python/arvados/keep.py b/sdk/python/arvados/keep.py
index 5caa572..c0c5c7e 100644
--- a/sdk/python/arvados/keep.py
+++ b/sdk/python/arvados/keep.py
@@ -340,7 +340,8 @@ class KeepClient(object):
             except:
                 ua.close()
 
-        def _socket_open(self, family, socktype, protocol, address):
+        @staticmethod
+        def _socket_open(family, socktype, protocol, address=None):
             """Because pycurl doesn't have CURLOPT_TCP_KEEPALIVE"""
             s = socket.socket(family, socktype, protocol)
             s.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)

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


hooks/post-receive
--