Merge github.com:grpc/grpc into now-i-get-to-show-it-to-EVERYBODY
Conflicts: src/cpp/client/channel_arguments.cc
Showing
- Makefile 12 additions, 12 deletionsMakefile
- gRPC.podspec 4 additions, 2 deletionsgRPC.podspec
- include/grpc++/channel_arguments.h 1 addition, 2 deletionsinclude/grpc++/channel_arguments.h
- include/grpc++/client_context.h 2 additions, 3 deletionsinclude/grpc++/client_context.h
- include/grpc/grpc.h 196 additions, 192 deletionsinclude/grpc/grpc.h
- src/compiler/objective_c_generator.cc 0 additions, 3 deletionssrc/compiler/objective_c_generator.cc
- src/compiler/objective_c_plugin.cc 3 additions, 2 deletionssrc/compiler/objective_c_plugin.cc
- src/cpp/client/channel_arguments.cc 1 addition, 1 deletionsrc/cpp/client/channel_arguments.cc
- src/cpp/client/client_context.cc 1 addition, 1 deletionsrc/cpp/client/client_context.cc
- src/csharp/Grpc.Auth/GoogleCredential.cs 16 additions, 0 deletionssrc/csharp/Grpc.Auth/GoogleCredential.cs
- src/csharp/Grpc.Core.Tests/Internal/MetadataArraySafeHandleTest.cs 2 additions, 1 deletion...p/Grpc.Core.Tests/Internal/MetadataArraySafeHandleTest.cs
- src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj 22 additions, 10 deletions...rp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
- src/csharp/Grpc.IntegrationTesting/InteropClient.cs 52 additions, 1 deletionsrc/csharp/Grpc.IntegrationTesting/InteropClient.cs
- src/node/README.md 2 additions, 2 deletionssrc/node/README.md
- src/node/examples/math_server.js 7 additions, 11 deletionssrc/node/examples/math_server.js
- src/node/examples/route_guide_server.js 7 additions, 9 deletionssrc/node/examples/route_guide_server.js
- src/node/examples/stock_server.js 6 additions, 9 deletionssrc/node/examples/stock_server.js
- src/node/index.js 2 additions, 4 deletionssrc/node/index.js
- src/node/interop/interop_server.js 9 additions, 11 deletionssrc/node/interop/interop_server.js
- src/node/src/server.js 107 additions, 148 deletionssrc/node/src/server.js
Loading
Please register or sign in to comment