Merge branch 'master' of github.com:grpc/grpc into grpclb_v0
No related branches found
No related tags found
Showing
- BUILD 22 additions, 24 deletionsBUILD
- Makefile 263 additions, 203 deletionsMakefile
- binding.gyp 3 additions, 1 deletionbinding.gyp
- build.yaml 51 additions, 56 deletionsbuild.yaml
- config.m4 3 additions, 1 deletionconfig.m4
- doc/cpp-style-guide.md 6 additions, 0 deletionsdoc/cpp-style-guide.md
- examples/python/route_guide/route_guide_server.py 1 addition, 1 deletionexamples/python/route_guide/route_guide_server.py
- gRPC.podspec 9 additions, 3 deletionsgRPC.podspec
- grpc.def 2 additions, 0 deletionsgrpc.def
- grpc.gemspec 6 additions, 2 deletionsgrpc.gemspec
- include/grpc++/ext/proto_server_reflection_plugin.h 1 addition, 1 deletioninclude/grpc++/ext/proto_server_reflection_plugin.h
- include/grpc++/impl/codegen/call.h 1 addition, 1 deletioninclude/grpc++/impl/codegen/call.h
- include/grpc++/impl/codegen/config.h 17 additions, 0 deletionsinclude/grpc++/impl/codegen/config.h
- include/grpc++/impl/codegen/core_codegen.h 24 additions, 22 deletionsinclude/grpc++/impl/codegen/core_codegen.h
- include/grpc++/impl/server_builder_option.h 1 addition, 2 deletionsinclude/grpc++/impl/server_builder_option.h
- include/grpc++/server_builder.h 1 addition, 1 deletioninclude/grpc++/server_builder.h
- include/grpc/support/avl.h 5 additions, 0 deletionsinclude/grpc/support/avl.h
- package.xml 6 additions, 2 deletionspackage.xml
- setup.py 0 additions, 1 deletionsetup.py
- src/compiler/cpp_generator.cc 4 additions, 3 deletionssrc/compiler/cpp_generator.cc
Loading
Please register or sign in to comment