[ARVADOS] updated: 21d528de3cd07b28e7b6bb2e195bc64e2b8abc15

[git at public.curoverse.com]

Summary of changes:
 sdk/cli/Gemfile.lock            | 4 ++--
 services/keepproxy/keepproxy.go | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

       via  21d528de3cd07b28e7b6bb2e195bc64e2b8abc15 (commit)
      from  f12f617fb736ddd48e4f2b9f57a6983ff8fe1ed3 (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 21d528de3cd07b28e7b6bb2e195bc64e2b8abc15
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Nov 26 02:25:22 2014 -0500

    3781: Fix OPTIONS routing.

diff --git a/sdk/cli/Gemfile.lock b/sdk/cli/Gemfile.lock
index fa7e1b2..b0371a1 100644
--- a/sdk/cli/Gemfile.lock
+++ b/sdk/cli/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arvados-cli (0.1.20141125003255)
+    arvados-cli (0.1.20141126055627)
       activesupport (~> 3.2, >= 3.2.13)
       andand (~> 1.3, >= 1.3.3)
       arvados (~> 0.1, >= 0.1.0)
@@ -20,7 +20,7 @@ GEM
       multi_json (~> 1.0)
     addressable (2.3.6)
     andand (1.3.3)
-    arvados (0.1.20141114230720)
+    arvados (0.1.20141118083211)
       activesupport (>= 3.2.13)
       andand (~> 1.3, >= 1.3.3)
       google-api-client (~> 0.6.3, >= 0.6.3)
diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index 503642d..a601938 100644
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -248,6 +248,7 @@ func MakeRESTRouter(
 		rest.Handle(`/{hash:[0-9a-f]{32}}+{hints}`, PutBlockHandler{kc, t}).Methods("PUT")
 		rest.Handle(`/{hash:[0-9a-f]{32}}`, PutBlockHandler{kc, t}).Methods("PUT")
 		rest.Handle(`/`, PutBlockHandler{kc, t}).Methods("POST")
+		rest.Handle(`/{any}`, OptionsHandler{}).Methods("OPTIONS")
 		rest.Handle(`/`, OptionsHandler{}).Methods("OPTIONS")
 	}
 

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


hooks/post-receive
--