[ARVADOS] updated: 63cfe7a9b391e1a07c6c6c8b0fab10b1c875f1be

Git user git at public.curoverse.com
Wed May 31 16:14:00 EDT 2017


Summary of changes:
 sdk/go/arvadosclient/arvadosclient.go              |  50 ++++++++--
 sdk/go/arvadosclient/arvadosclient_test.go         |  18 ++--
 sdk/go/keepclient/discover.go                      |  12 ---
 sdk/go/keepclient/keepclient.go                    | 111 ++++++++++++++++++---
 sdk/go/keepclient/keepclient_test.go               |   2 +-
 sdk/go/keepclient/support.go                       |  52 +---------
 services/keep-balance/integration_test.go          |   9 +-
 services/keep-web/handler.go                       |   6 --
 services/keepproxy/keepproxy.go                    |  46 ++++++---
 services/keepproxy/keepproxy_test.go               |   2 +-
 services/keepstore/keepstore.go                    |   1 -
 services/keepstore/pull_worker_integration_test.go |   2 -
 tools/keep-exercise/keep-exercise.go               |   8 +-
 13 files changed, 197 insertions(+), 122 deletions(-)

       via  63cfe7a9b391e1a07c6c6c8b0fab10b1c875f1be (commit)
       via  fd1b1b760f96e5c86e70dd8eb2e629b55f55fe55 (commit)
       via  a84b665349051a06df5728f435203c8353b5795a (commit)
       via  75c5b123e0b4cbfebed9b15364a97c2209f94740 (commit)
       via  6fe6390690471cee8ba23984e3560fc4ced8b180 (commit)
      from  4d0d27f83183b6659a570ae1fc07f95aefe0b23e (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 63cfe7a9b391e1a07c6c6c8b0fab10b1c875f1be
Merge: 4d0d27f fd1b1b7
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed May 31 16:13:50 2017 -0400

    Merge branch '9005-keep-http-client'
    
    refs #9005


commit fd1b1b760f96e5c86e70dd8eb2e629b55f55fe55
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed May 31 16:12:44 2017 -0400

    9005: Modify default transport instead of building from scratch.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>

diff --git a/tools/keep-exercise/keep-exercise.go b/tools/keep-exercise/keep-exercise.go
index 267bc90..a468473 100644
--- a/tools/keep-exercise/keep-exercise.go
+++ b/tools/keep-exercise/keep-exercise.go
@@ -53,11 +53,12 @@ func main() {
 		log.Fatal(err)
 	}
 	kc.Want_replicas = *Replicas
+
+	transport := *(http.DefaultTransport.(*http.Transport))
+	transport.TLSClientConfig = arvadosclient.MakeTLSConfig(arv.ApiInsecure)
 	kc.HTTPClient = &http.Client{
-		Timeout: 10 * time.Minute,
-		Transport: &http.Transport{
-			TLSClientConfig: arvadosclient.MakeTLSConfig(arv.ApiInsecure),
-		},
+		Timeout:   10 * time.Minute,
+		Transport: &transport,
 	}
 
 	overrideServices(kc)

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list