Skip to content

Commit

Permalink
Merge pull request #14297 from andreimatei/grpc-update
Browse files Browse the repository at this point in the history
vendor: update grpc-go and update non-pinned deps
  • Loading branch information
andreimatei authored Mar 22, 2017
2 parents bd92fbd + 371f3c7 commit b66ffbf
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 14 deletions.
19 changes: 10 additions & 9 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import:
# https://github.com/grpc/grpc-go/issues/760
# https://github.com/grpc/grpc-go/issues/1043
- package: google.golang.org/grpc
version: d3f1ab4a4dca70781cf6dc850a79ed38632660a6
repo: https://github.com/petermattis/grpc-go
version: 9d55a95b90eb10d08a07e0213d23797dbd7b7552
repo: https://github.com/andreimatei/grpc-go
# Pins to prevent unintended version changes to libs we care about when adding/
# removing/changing other deps. These are grouped separately to make it easier
# to comment them out in bulk when running an across-the-board dep update.
Expand Down
4 changes: 2 additions & 2 deletions pkg/cli/cli_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -297,11 +297,11 @@ communicate with a secure cluster\).
// Error returned from GRPC to internal/client (which has to pass it
// up the stack as a roachpb.NewError(roachpb.NewSendError(.)).
{`debug kv inc a`, styled(
`increment failed: failed to send RPC: rpc error: code = 14 desc = grpc: the connection is unavailable`),
`increment failed: failed to send RPC: rpc error: code = Unavailable desc = grpc: the connection is unavailable`),
},
// Error returned directly from GRPC.
{`quit`, styled(
`rpc error: code = 14 desc = grpc: the connection is unavailable`),
`rpc error: code = Unavailable desc = grpc: the connection is unavailable`),
},
// Going through the SQL client libraries gives a *net.OpError which
// we also handle.
Expand Down
2 changes: 1 addition & 1 deletion vendor
Submodule vendor updated 83 files
+30 −81 github.com/docker/distribution/registry/api/v2/urls.go
+55 −194 github.com/docker/distribution/registry/api/v2/urls_test.go
+1 −1 github.com/google/go-github/github/github.go
+60 −0 github.com/google/go-github/github/orgs_projects.go
+68 −0 github.com/google/go-github/github/orgs_projects_test.go
+12 −3 github.com/google/go-github/github/repos_projects.go
+2 −2 github.com/google/go-github/github/repos_projects_test.go
+17 −5 github.com/google/go-github/github/users_gpg_keys.go
+30 −2 github.com/google/go-github/github/users_gpg_keys_test.go
+20 −18 github.com/lightstep/lightstep-tracer-go/thrift_rpc/logencoder.go
+3 −0 github.com/tebeka/go2xunit/ChangeLog
+10 −0 github.com/tebeka/go2xunit/data/in/gotest-escaped.out
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gocheck-empty.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gocheck-fail.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gocheck-panic.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gocheck-pass.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gocheck-setup-miss.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-0.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-1.5.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-1.6.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-1.7.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-datarace.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-empty.out.xml
+50 −0 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-escaped.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-fail.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-fatal-nosummary.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-log.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-multi.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-multierror.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-negative-duration.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-nofiles.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-nosummary.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-num.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-panic.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-pass.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-print.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest-testify-suite.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit.net/gotest.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gocheck-empty.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gocheck-fail.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gocheck-panic.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gocheck-pass.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gocheck-setup-miss.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-0.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-1.5.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-1.6.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-1.7.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-datarace.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-empty.out.xml
+16 −0 github.com/tebeka/go2xunit/data/out/xunit/gotest-escaped.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-fail.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-fatal-nosummary.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-log.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-multi.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-multierror.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-negative-duration.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-nofiles.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-nosummary.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-num.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-panic.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-pass.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-print.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest-testify-suite.out.xml
+2 −1 github.com/tebeka/go2xunit/data/out/xunit/gotest.out.xml
+20 −10 github.com/tebeka/go2xunit/lib/xmlout.go
+1 −1 github.com/tebeka/go2xunit/main.go
+9 −236 google.golang.org/appengine/cmd/aedeploy/aedeploy.go
+1 −2 google.golang.org/grpc/call.go
+68 −48 google.golang.org/grpc/clientconn.go
+41 −0 google.golang.org/grpc/clientconn_test.go
+1 −1 google.golang.org/grpc/examples/helloworld/mock/hw_test.go
+27 −29 google.golang.org/grpc/grpclb/grpclb_test.go
+52 −0 google.golang.org/grpc/keepalive/keepalive.go
+1 −1 google.golang.org/grpc/rpc_util.go
+1 −1 google.golang.org/grpc/server_test.go
+22 −21 google.golang.org/grpc/stream.go
+74 −81 google.golang.org/grpc/test/end2end_test.go
+8 −2 google.golang.org/grpc/transport/control.go
+1 −1 google.golang.org/grpc/transport/handler_server_test.go
+150 −45 google.golang.org/grpc/transport/http2_client.go
+16 −4 google.golang.org/grpc/transport/http2_server.go
+10 −1 google.golang.org/grpc/transport/transport.go
+132 −2 google.golang.org/grpc/transport/transport_test.go

0 comments on commit b66ffbf

Please sign in to comment.