Merge pull request #10598 from jtattermusch/manual_upmerge_v12x
Manual upmerge from v1.2.x
No related branches found
No related tags found
Showing
- BUILD 2 additions, 2 deletionsBUILD
- examples/csharp/helloworld-from-cli/global.json 1 addition, 1 deletionexamples/csharp/helloworld-from-cli/global.json
- src/core/lib/channel/message_size_filter.c 2 additions, 2 deletionssrc/core/lib/channel/message_size_filter.c
- src/core/lib/iomgr/resolve_address_uv.c 2 additions, 1 deletionsrc/core/lib/iomgr/resolve_address_uv.c
- src/csharp/Grpc.Auth/project.json 0 additions, 35 deletionssrc/csharp/Grpc.Auth/project.json
- src/csharp/Grpc.Core.Testing/project.json 0 additions, 39 deletionssrc/csharp/Grpc.Core.Testing/project.json
- src/csharp/Grpc.HealthCheck/project.json 0 additions, 35 deletionssrc/csharp/Grpc.HealthCheck/project.json
- src/csharp/Grpc.Reflection/project.json 0 additions, 35 deletionssrc/csharp/Grpc.Reflection/project.json
- src/csharp/global.json 5 additions, 0 deletionssrc/csharp/global.json
- src/node/ext/call.cc 61 additions, 24 deletionssrc/node/ext/call.cc
- src/node/ext/call.h 8 additions, 1 deletionsrc/node/ext/call.h
- src/node/ext/call_credentials.cc 2 additions, 0 deletionssrc/node/ext/call_credentials.cc
- src/node/ext/channel.cc 1 addition, 1 deletionsrc/node/ext/channel.cc
- src/node/ext/node_grpc.cc 9 additions, 3 deletionssrc/node/ext/node_grpc.cc
- src/node/ext/server.cc 2 additions, 2 deletionssrc/node/ext/server.cc
- src/node/ext/server_uv.cc 2 additions, 1 deletionsrc/node/ext/server_uv.cc
Loading
Please register or sign in to comment