grpc
/
grpc-go
mirror of https://github.com/grpc/grpc-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

This commit is contained in:
yangzhouhan 2015-08-12 12:49:51 -07:00
parent dd17fced98
commit 6eb790420c
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
credentials/credentials.go
View File

@ -51,7 +51,7 @@ import (
var (
// alpnProtoStr are the specified application level protocols for gRPC.
alpnProtoStr = []string{"h2", "h2-14", "h2-15", "h2-16"}
alpnProtoStr = []string{"h2"}
)
// Credentials defines the common interface all supported credentials must

4
interop/client/client.go
View File

@ -277,11 +277,7 @@ func doTimeoutOnSleepingServer(tc testpb.TestServiceClient) {
grpclog.Fatalf("%v.Send(%v) = %v", stream, req, err)
}
if _, err := stream.Recv(); grpc.Code(err) != codes.DeadlineExceeded {
<<<<<<< HEAD
grpclog.Fatalf("%v.Recv() = _, %v, want error code %d", stream, err, codes.DeadlineExceeded)
=======
grpclog.Fatalf("%v got the error %v, want error code: %d", stream, err, codes.DeadlineExceeded)
>>>>>>> 2a4442cda2d99dad88ccbcaf39f8975fcf85747c
}
grpclog.Println("TimeoutOnSleepingServer done")
}