Merge branch 'master' into backport-merge
No related branches found
No related tags found
Showing
- .gitmodules 1 addition, 1 deletion.gitmodules
- BUILD 352 additions, 399 deletionsBUILD
- Makefile 932 additions, 813 deletionsMakefile
- README.md 2 additions, 0 deletionsREADME.md
- binding.gyp 93 additions, 66 deletionsbinding.gyp
- build.yaml 409 additions, 87 deletionsbuild.yaml
- doc/load-balancing.md 97 additions, 0 deletionsdoc/load-balancing.md
- examples/cpp/helloworld/Makefile 1 addition, 1 deletionexamples/cpp/helloworld/Makefile
- examples/cpp/route_guide/Makefile 1 addition, 1 deletionexamples/cpp/route_guide/Makefile
- examples/protos/helloworld.proto 4 additions, 2 deletionsexamples/protos/helloworld.proto
- examples/protos/route_guide.proto 4 additions, 2 deletionsexamples/protos/route_guide.proto
- gRPC.podspec 165 additions, 159 deletionsgRPC.podspec
- grpc.def 1 addition, 0 deletionsgrpc.def
- grpc.gemspec 104 additions, 100 deletionsgrpc.gemspec
- include/grpc++/alarm.h 16 additions, 0 deletionsinclude/grpc++/alarm.h
- include/grpc++/create_channel.h 2 additions, 1 deletioninclude/grpc++/create_channel.h
- include/grpc++/impl/codegen/call.h 3 additions, 0 deletionsinclude/grpc++/impl/codegen/call.h
- include/grpc++/impl/codegen/rpc_service_method.h 1 addition, 0 deletionsinclude/grpc++/impl/codegen/rpc_service_method.h
- include/grpc++/impl/codegen/server_interface.h 1 addition, 2 deletionsinclude/grpc++/impl/codegen/server_interface.h
- include/grpc++/impl/codegen/sync_stream.h 18 additions, 2 deletionsinclude/grpc++/impl/codegen/sync_stream.h
Loading
Please register or sign in to comment