[ARVADOS] updated: c2e70e05178c9569e9de2ac5b3ef47440c49efc5

[git at public.curoverse.com]

Summary of changes:
 services/api/app/controllers/arvados/v1/keep_services_controller.rb | 2 +-
 services/api/test/integration/keep_proxy_test.rb                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

       via  c2e70e05178c9569e9de2ac5b3ef47440c49efc5 (commit)
      from  1b3750c9ffbec7a76b374023188c5c13882dc651 (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 c2e70e05178c9569e9de2ac5b3ef47440c49efc5
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed May 21 16:35:50 2014 -0400

    Changed API server to use X-External-Client instead of
    X-Keep-Proxy-Required. refs #2776

diff --git a/services/api/app/controllers/arvados/v1/keep_services_controller.rb b/services/api/app/controllers/arvados/v1/keep_services_controller.rb
index 2cb68fd..fc2ee93 100644
--- a/services/api/app/controllers/arvados/v1/keep_services_controller.rb
+++ b/services/api/app/controllers/arvados/v1/keep_services_controller.rb
@@ -10,7 +10,7 @@ class Arvados::V1::KeepServicesController < ApplicationController
   end
 
   def accessible
-    if request.headers['X-Keep-Proxy-Required']
+    if request.headers['X-External-Client'] == '1'
       @objects = model_class.where('service_type=?', 'proxy')
     else
       @objects = model_class.where('service_type=?', 'disk')
diff --git a/services/api/test/integration/keep_proxy_test.rb b/services/api/test/integration/keep_proxy_test.rb
index 347f69d..d4155c2 100644
--- a/services/api/test/integration/keep_proxy_test.rb
+++ b/services/api/test/integration/keep_proxy_test.rb
@@ -10,7 +10,7 @@ class KeepProxyTest < ActionDispatch::IntegrationTest
     assert_equal 'disk', services[0]['service_type']
     assert_equal 'disk', services[1]['service_type']
 
-    get "/arvados/v1/keep_services/accessible", {:format => :json}, auth(:active).merge({'HTTP_X_KEEP_PROXY_REQUIRED' => true})
+    get "/arvados/v1/keep_services/accessible", {:format => :json}, auth(:active).merge({'HTTP_X_EXTERNAL_CLIENT' => '1'})
     assert_response :success
     services = json_response['items']
 

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


hooks/post-receive
--