Merge pull request #10293 from nicolasnoble/upmerge-1.2.0
Upmerge from 1.2.0
No related branches found
No related tags found
Showing
- BUILD 3 additions, 3 deletionsBUILD
- Rakefile 2 additions, 1 deletionRakefile
- binding.gyp 3 additions, 5 deletionsbinding.gyp
- gRPC-Core.podspec 4 additions, 5 deletionsgRPC-Core.podspec
- gRPC-ProtoRPC.podspec 1 addition, 1 deletiongRPC-ProtoRPC.podspec
- gRPC-RxLibrary.podspec 1 addition, 1 deletiongRPC-RxLibrary.podspec
- gRPC.podspec 1 addition, 1 deletiongRPC.podspec
- package.json 1 addition, 1 deletionpackage.json
- setup.py 4 additions, 0 deletionssetup.py
- src/compiler/csharp_generator.cc 43 additions, 34 deletionssrc/compiler/csharp_generator.cc
- src/core/lib/iomgr/tcp_server_posix.c 2 additions, 5 deletionssrc/core/lib/iomgr/tcp_server_posix.c
- src/core/lib/iomgr/timer_uv.c 4 additions, 0 deletionssrc/core/lib/iomgr/timer_uv.c
- src/csharp/Grpc.Core/ChannelOptions.cs 8 additions, 1 deletionsrc/csharp/Grpc.Core/ChannelOptions.cs
- src/csharp/Grpc.Examples/MathGrpc.cs 41 additions, 41 deletionssrc/csharp/Grpc.Examples/MathGrpc.cs
- src/csharp/Grpc.HealthCheck/HealthGrpc.cs 18 additions, 18 deletionssrc/csharp/Grpc.HealthCheck/HealthGrpc.cs
- src/csharp/Grpc.IntegrationTesting/MetricsGrpc.cs 26 additions, 26 deletionssrc/csharp/Grpc.IntegrationTesting/MetricsGrpc.cs
- src/csharp/Grpc.IntegrationTesting/ServicesGrpc.cs 71 additions, 71 deletionssrc/csharp/Grpc.IntegrationTesting/ServicesGrpc.cs
- src/csharp/Grpc.IntegrationTesting/TestGrpc.cs 125 additions, 125 deletionssrc/csharp/Grpc.IntegrationTesting/TestGrpc.cs
- src/csharp/Grpc.Reflection/ReflectionGrpc.cs 15 additions, 15 deletionssrc/csharp/Grpc.Reflection/ReflectionGrpc.cs
- src/node/ext/server_uv.cc 1 addition, 1 deletionsrc/node/ext/server_uv.cc
Loading
Please register or sign in to comment