Merge branch 'master' of https://github.com/grpc/grpc into ares-header-pollution
# Conflicts: # src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.c
No related branches found
No related tags found
Showing
- BUILD 83 additions, 69 deletionsBUILD
- CMakeLists.txt 110 additions, 115 deletionsCMakeLists.txt
- Makefile 111 additions, 116 deletionsMakefile
- binding.gyp 34 additions, 34 deletionsbinding.gyp
- build.yaml 80 additions, 72 deletionsbuild.yaml
- config.m4 44 additions, 43 deletionsconfig.m4
- gRPC-Core.podspec 89 additions, 89 deletionsgRPC-Core.podspec
- grpc.gemspec 61 additions, 61 deletionsgrpc.gemspec
- include/grpc/impl/codegen/grpc_types.h 3 additions, 0 deletionsinclude/grpc/impl/codegen/grpc_types.h
- package.xml 61 additions, 61 deletionspackage.xml
- src/core/ext/census/gen/trace_context.pb.h 1 addition, 1 deletionsrc/core/ext/census/gen/trace_context.pb.h
- src/core/ext/census/grpc_plugin.c 1 addition, 1 deletionsrc/core/ext/census/grpc_plugin.c
- src/core/ext/census/trace_label.h 1 addition, 1 deletionsrc/core/ext/census/trace_label.h
- src/core/ext/census/trace_propagation.h 1 addition, 1 deletionsrc/core/ext/census/trace_propagation.h
- src/core/ext/census/trace_status.h 1 addition, 1 deletionsrc/core/ext/census/trace_status.h
- src/core/ext/census/trace_string.h 1 addition, 1 deletionsrc/core/ext/census/trace_string.h
- src/core/ext/census/tracing.h 1 addition, 1 deletionsrc/core/ext/census/tracing.h
- src/core/ext/filters/client_channel/README.md 0 additions, 0 deletionssrc/core/ext/filters/client_channel/README.md
- src/core/ext/filters/client_channel/channel_connectivity.c 1 addition, 1 deletionsrc/core/ext/filters/client_channel/channel_connectivity.c
- src/core/ext/filters/client_channel/client_channel.c 7 additions, 7 deletionssrc/core/ext/filters/client_channel/client_channel.c
Loading
Please register or sign in to comment