projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b21dbd5 49707c4)
12167: Merge branch 'master' into 12167-keep-request-id
authorTom Clegg <tclegg@veritasgenetics.com>
Sat, 25 Nov 2017 07:20:23 +0000 (02:20 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 27 Nov 2017 15:05:03 +0000 (10:05 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

1  2 
services/keepproxy/keepproxy_test.go patch | diff1 | diff2 | blob | history

diff --cc services/keepproxy/keepproxy_test.go
index eb2ed5349d93fc9e9d7790690dda84c7d4a86d46,23bb2bd216c1f1080d246e63a47252564e4d9bf4..a7b608b69c462fd4149f932c16dbabcaddbca6c6
--- 1/services/keepproxy/keepproxy_test.go
--- 2/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@@ -10,6 -10,8 +10,7 @@@ import 
        "errors"
        "fmt"
        "io/ioutil"
 -      "log"
+       "math/rand"
        "net/http"
        "net/http/httptest"
        "os"