[ARVADOS] updated: caaa8219e0bf32779a27d2e6c2b598380ca96e6d

[git at public.curoverse.com]

Summary of changes:
 .../app/assets/javascripts/infinite_scroll.js      | 34 ++++++++++++++++++++++
 .../app/controllers/collections_controller.rb      |  4 ++-
 .../controllers/pipeline_instances_controller.rb   |  6 ++--
 apps/workbench/app/helpers/application_helper.rb   |  4 +--
 .../app/views/collections/hash_matches.html.erb    |  8 ++++-
 .../workbench/test/integration/collections_test.rb | 20 +++++++++++--
 sdk/python/arvados/keep.py                         |  9 +++---
 sdk/python/setup.py                                |  2 +-
 sdk/python/tests/arvados_testutil.py               |  4 +--
 9 files changed, 75 insertions(+), 16 deletions(-)

       via  caaa8219e0bf32779a27d2e6c2b598380ca96e6d (commit)
       via  6c9dde5e6089efc8a87022ab9771da96932516a7 (commit)
       via  acc7d4a40ae78e866c983624ec36b7bae3b918a9 (commit)
       via  61d399a57fd1e867cc243a0dab0fad73d9689734 (commit)
       via  e01762a0adcdee209f305cfc2ae902ab4eb94899 (commit)
       via  48c6eca6aa6af517f67d39545b714946676cd2b5 (commit)
       via  ec0c9f0d12560296d4b678c8ad33e1b82221e626 (commit)
       via  19db486cda40c892afb1111bb3d35d482ab1fbb2 (commit)
       via  b6c7ee612c09a110b6e2a87a12eebc5b81a7a2e8 (commit)
      from  ea7c7efb7d2d7429677f6d95eb92128d7574d6a5 (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 caaa8219e0bf32779a27d2e6c2b598380ca96e6d
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Apr 30 11:16:47 2015 -0400

    5562: Use static method. Fixes "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..5406f33 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):
             """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
--