[ARVADOS] updated: 59994ce0b7623c84d2d633c7c0bac0966245932c

[git at public.curoverse.com]

Summary of changes:
 .../arvados/v1/keep_disks_controller.rb            |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

       via  59994ce0b7623c84d2d633c7c0bac0966245932c (commit)
      from  6779e6dd8bd666a5f398345e88c077dccca901ea (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 59994ce0b7623c84d2d633c7c0bac0966245932c
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jan 24 08:45:36 2014 -0800

    Fix keep_disks.ping to accept a correct ping_secret in lieu of a
    sufficiently authorized token.

diff --git a/services/api/app/controllers/arvados/v1/keep_disks_controller.rb b/services/api/app/controllers/arvados/v1/keep_disks_controller.rb
index 0da729c..cfe657e 100644
--- a/services/api/app/controllers/arvados/v1/keep_disks_controller.rb
+++ b/services/api/app/controllers/arvados/v1/keep_disks_controller.rb
@@ -1,5 +1,6 @@
 class Arvados::V1::KeepDisksController < ApplicationController
   skip_before_filter :require_auth_scope_all, :only => :ping
+  skip_before_filter :find_object_by_uuid, :only => :ping
 
   def self._ping_requires_parameters
     {
@@ -13,6 +14,7 @@ class Arvados::V1::KeepDisksController < ApplicationController
     }
   end
   def ping
+    @object = Node.where(uuid: (params[:id] || params[:uuid])).first
     if !@object
       if current_user.andand.is_admin
         @object = KeepDisk.new(filesystem_uuid: params[:filesystem_uuid])

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


hooks/post-receive
--