Merge remote-tracking branch 'upstream/master' into grpclb_resolver_changes
Showing
- BUILD 16 additions, 0 deletionsBUILD
- CMakeLists.txt 6 additions, 0 deletionsCMakeLists.txt
- Makefile 79 additions, 0 deletionsMakefile
- binding.gyp 2 additions, 0 deletionsbinding.gyp
- build.yaml 24 additions, 0 deletionsbuild.yaml
- config.m4 2 additions, 0 deletionsconfig.m4
- examples/cpp/helloworld/greeter_async_client.cc 1 addition, 0 deletionsexamples/cpp/helloworld/greeter_async_client.cc
- examples/cpp/helloworld/greeter_async_client2.cc 1 addition, 0 deletionsexamples/cpp/helloworld/greeter_async_client2.cc
- examples/cpp/helloworld/greeter_async_server.cc 1 addition, 0 deletionsexamples/cpp/helloworld/greeter_async_server.cc
- gRPC-Core.podspec 6 additions, 0 deletionsgRPC-Core.podspec
- grpc.gemspec 4 additions, 0 deletionsgrpc.gemspec
- include/grpc/impl/codegen/atm.h 3 additions, 0 deletionsinclude/grpc/impl/codegen/atm.h
- include/grpc/impl/codegen/atm_gcc_atomic.h 2 additions, 0 deletionsinclude/grpc/impl/codegen/atm_gcc_atomic.h
- include/grpc/impl/codegen/atm_gcc_sync.h 8 additions, 0 deletionsinclude/grpc/impl/codegen/atm_gcc_sync.h
- include/grpc/impl/codegen/atm_windows.h 4 additions, 0 deletionsinclude/grpc/impl/codegen/atm_windows.h
- package.xml 4 additions, 0 deletionspackage.xml
- src/core/ext/client_config/client_channel.c 9 additions, 5 deletionssrc/core/ext/client_config/client_channel.c
- src/core/ext/client_config/subchannel.c 8 additions, 10 deletionssrc/core/ext/client_config/subchannel.c
- src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c 1 addition, 1 deletion.../ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.c
- src/core/ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h 1 addition, 1 deletion.../ext/lb_policy/grpclb/proto/grpc/lb/v1/load_balancer.pb.h
Loading
Please register or sign in to comment