- Downloads
Merge branch 'master' of github.com:grpc/grpc into the-ultimate-showdown
Conflicts: src/cpp/client/channel.cc src/cpp/client/client_context.cc
Showing
- doc/connectivity-semantics-and-api.md 1 addition, 1 deletiondoc/connectivity-semantics-and-api.md
- include/grpc++/client_context.h 0 additions, 4 deletionsinclude/grpc++/client_context.h
- include/grpc/census.h 55 additions, 0 deletionsinclude/grpc/census.h
- src/core/security/client_auth_filter.c 8 additions, 7 deletionssrc/core/security/client_auth_filter.c
- src/cpp/client/channel.cc 19 additions, 14 deletionssrc/cpp/client/channel.cc
- src/cpp/client/client_context.cc 0 additions, 11 deletionssrc/cpp/client/client_context.cc
- src/csharp/Grpc.Core.Tests/ClientBaseTest.cs 62 additions, 0 deletionssrc/csharp/Grpc.Core.Tests/ClientBaseTest.cs
- src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj 1 addition, 0 deletionssrc/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj
- src/csharp/Grpc.Core/ClientBase.cs 20 additions, 5 deletionssrc/csharp/Grpc.Core/ClientBase.cs
- src/objective-c/GRPCClient/GRPCCall+OAuth2.m 4 additions, 4 deletionssrc/objective-c/GRPCClient/GRPCCall+OAuth2.m
- src/objective-c/GRPCClient/GRPCCall.h 32 additions, 24 deletionssrc/objective-c/GRPCClient/GRPCCall.h
- src/objective-c/GRPCClient/GRPCCall.m 33 additions, 26 deletionssrc/objective-c/GRPCClient/GRPCCall.m
- src/objective-c/tests/GRPCClientTests.m 5 additions, 3 deletionssrc/objective-c/tests/GRPCClientTests.m
- src/ruby/ext/grpc/rb_channel.c 81 additions, 0 deletionssrc/ruby/ext/grpc/rb_channel.c
- test/core/end2end/tests/bad_hostname.c 1 addition, 1 deletiontest/core/end2end/tests/bad_hostname.c
Loading
Please sign in to comment