[ARVADOS] updated: 11236731eda455b5df6448733e4c0090a5f727c4

[git at public.curoverse.com]

Summary of changes:
 sdk/ruby/arvados.gemspec                                     | 2 +-
 services/keepstore/handler_test.go                           | 3 +--
 services/keepstore/keepstore.go                              | 3 +--
 services/{keep/keep_utils.go => keepstore/router_wrapper.go} | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename services/{keep/keep_utils.go => keepstore/router_wrapper.go} (98%)

       via  11236731eda455b5df6448733e4c0090a5f727c4 (commit)
       via  8c682e4ffcd8fdf9bcaf8f062f1d0a6517ea9e5d (commit)
       via  6de0a4ab0323e69a5499e59af03c9c5e6125fed7 (commit)
      from  f798c910fa1966b0471451de4f24cc4f55e07290 (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 11236731eda455b5df6448733e4c0090a5f727c4
Author: radhika <radhika at curoverse.com>
Date:   Fri Nov 14 22:27:29 2014 -0500

    4194: refactor router wrapper into a separate file.

diff --git a/services/keepstore/handler_test.go b/services/keepstore/handler_test.go
index f30287a..e50a9a3 100644
--- a/services/keepstore/handler_test.go
+++ b/services/keepstore/handler_test.go
@@ -21,7 +21,6 @@ import (
 	"strings"
 	"testing"
 	"time"
-	"git.curoverse.com/arvados.git/services/keep"
 )
 
 // A RequestTester represents the parameters for an HTTP request to
@@ -751,7 +750,7 @@ func IssueRequest(router *mux.Router, rt *RequestTester) *httptest.ResponseRecor
 	if rt.api_token != "" {
 		req.Header.Set("Authorization", "OAuth2 "+rt.api_token)
 	}
-  routerWrapper := keep_utils.MakeRESTRouterWrapper(router)
+  routerWrapper := MakeRESTRouterWrapper(router)
   routerWrapper.ServeHTTP(response, req)
 	return response
 }
diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 6d149f7..9c608d5 100644
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -13,7 +13,6 @@ import (
 	"strings"
 	"syscall"
 	"time"
-	"git.curoverse.com/arvados.git/services/keep"
 )
 
 // ======================
@@ -264,7 +263,7 @@ func main() {
 	KeepVM = MakeRRVolumeManager(goodvols)
 
 	// Tell the built-in HTTP server to direct all requests to the REST router.
-  routerWrapper := keep_utils.MakeRESTRouterWrapper(MakeRESTRouter())
+  routerWrapper := MakeRESTRouterWrapper(MakeRESTRouter())
   http.HandleFunc("/", func(resp http.ResponseWriter, req *http.Request) {
     routerWrapper.ServeHTTP(resp, req)
   })
diff --git a/services/keep/keep_utils.go b/services/keepstore/router_wrapper.go
similarity index 98%
rename from services/keep/keep_utils.go
rename to services/keepstore/router_wrapper.go
index e9163c0..3e06f56 100644
--- a/services/keep/keep_utils.go
+++ b/services/keepstore/router_wrapper.go
@@ -1,4 +1,4 @@
-package keep_utils
+package main
 
 // RESTRouterWrapper
 // LoggingResponseWriter

commit 8c682e4ffcd8fdf9bcaf8f062f1d0a6517ea9e5d
Merge: f798c91 6de0a4a
Author: radhika <radhika at curoverse.com>
Date:   Fri Nov 14 21:32:47 2014 -0500

    Merge branch 'master' into 4194-keep-logging


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


hooks/post-receive
--