-
- Downloads
Merge pull request #19 from soltanmm/ct-you-complete-me
Fix upstream merge conflicts
Showing
- doc/connectivity-semantics-and-api.md 122 additions, 0 deletionsdoc/connectivity-semantics-and-api.md
- include/grpc/grpc.h 2 additions, 2 deletionsinclude/grpc/grpc.h
- include/grpc/support/slice.h 3 additions, 2 deletionsinclude/grpc/support/slice.h
- src/compiler/cpp_generator.cc 11 additions, 0 deletionssrc/compiler/cpp_generator.cc
- src/core/support/log_win32.c 2 additions, 1 deletionsrc/core/support/log_win32.c
- src/core/transport/stream_op.h 3 additions, 5 deletionssrc/core/transport/stream_op.h
- src/csharp/Grpc.Core.Tests/ChannelOptionsTest.cs 105 additions, 0 deletionssrc/csharp/Grpc.Core.Tests/ChannelOptionsTest.cs
- src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj 3 additions, 3 deletionssrc/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj
- src/csharp/Grpc.Core.Tests/Internal/ChannelArgsSafeHandleTest.cs 75 additions, 0 deletions...arp/Grpc.Core.Tests/Internal/ChannelArgsSafeHandleTest.cs
- src/csharp/Grpc.Core/Channel.cs 22 additions, 18 deletionssrc/csharp/Grpc.Core/Channel.cs
- src/csharp/Grpc.Core/ChannelOptions.cs 178 additions, 0 deletionssrc/csharp/Grpc.Core/ChannelOptions.cs
- src/csharp/Grpc.Core/Grpc.Core.csproj 2 additions, 4 deletionssrc/csharp/Grpc.Core/Grpc.Core.csproj
- src/csharp/Grpc.Core/Internal/ChannelArgsSafeHandle.cs 8 additions, 0 deletionssrc/csharp/Grpc.Core/Internal/ChannelArgsSafeHandle.cs
- src/csharp/Grpc.Core/Internal/ServerSafeHandle.cs 2 additions, 2 deletionssrc/csharp/Grpc.Core/Internal/ServerSafeHandle.cs
- src/csharp/Grpc.Core/Server.cs 9 additions, 2 deletionssrc/csharp/Grpc.Core/Server.cs
- src/csharp/Grpc.IntegrationTesting/InteropClient.cs 6 additions, 4 deletionssrc/csharp/Grpc.IntegrationTesting/InteropClient.cs
- src/csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs 5 additions, 4 deletions...csharp/Grpc.IntegrationTesting/InteropClientServerTest.cs
- src/csharp/ext/grpc_csharp_ext.c 14 additions, 4 deletionssrc/csharp/ext/grpc_csharp_ext.c
- src/php/README.md 104 additions, 33 deletionssrc/php/README.md
- src/php/bin/run_gen_code_test.sh 2 additions, 2 deletionssrc/php/bin/run_gen_code_test.sh
Loading
Please register or sign in to comment