[ARVADOS] updated: 3692a4ac4d8f76d2e704af5e504652650b4a00cc

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/functional/application_controller_test.rb | 2 +-
 services/api/app/middlewares/rack_socket.rb                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

       via  3692a4ac4d8f76d2e704af5e504652650b4a00cc (commit)
       via  73c0b152d18774266e72916d6f8cedb3199b535c (commit)
       via  0ef7495b59056c8f115a42bd843ce432c9282e8c (commit)
      from  2cdc648b5367efd4c8e7b2ede93a2b3ba0871c17 (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 3692a4ac4d8f76d2e704af5e504652650b4a00cc
Merge: 73c0b15 0ef7495
Author: radhika <radhika at curoverse.com>
Date:   Tue Jun 10 08:58:22 2014 -0400

    Merge branch 'master' into 2871-preload-objects


commit 73c0b152d18774266e72916d6f8cedb3199b535c
Author: radhika <radhika at curoverse.com>
Date:   Tue Jun 10 08:49:39 2014 -0400

    2871: trailing whitespace

diff --git a/apps/workbench/test/functional/application_controller_test.rb b/apps/workbench/test/functional/application_controller_test.rb
index 8183443..f3dbcb5 100644
--- a/apps/workbench/test/functional/application_controller_test.rb
+++ b/apps/workbench/test/functional/application_controller_test.rb
@@ -83,7 +83,7 @@ class ApplicationControllerTest < ActionController::TestCase
     [:preload_log_collections_for_objects, nil],
     [:log_collections_for_object, nil],
     [:preload_objects_for_dataclass, 'input not an array'],
-    [:preload_objects_for_dataclass, nil],    
+    [:preload_objects_for_dataclass, nil],
     [:object_for_dataclass, 'some_dataclass', nil],
     [:object_for_dataclass, nil, 'some_uuid'],
   ].each do |input|

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


hooks/post-receive
--