Merge branch 'master' of github.com:grpc/grpc into subchannel_factory_create_lb_channel
No related branches found
No related tags found
Showing
- BUILD 7 additions, 14 deletionsBUILD
- Makefile 5 additions, 5 deletionsMakefile
- binding.gyp 2 additions, 2 deletionsbinding.gyp
- build.yaml 17 additions, 7 deletionsbuild.yaml
- config.m4 4 additions, 3 deletionsconfig.m4
- gRPC.podspec 2 additions, 6 deletionsgRPC.podspec
- grpc.gemspec 2 additions, 4 deletionsgrpc.gemspec
- package.json 2 additions, 4 deletionspackage.json
- package.xml 2 additions, 4 deletionspackage.xml
- src/core/ext/resolver/dns/native/README.md 2 additions, 0 deletionssrc/core/ext/resolver/dns/native/README.md
- src/core/ext/resolver/dns/native/dns_resolver.c 10 additions, 5 deletionssrc/core/ext/resolver/dns/native/dns_resolver.c
- src/core/ext/resolver/sockaddr/README.md 1 addition, 0 deletionssrc/core/ext/resolver/sockaddr/README.md
- src/core/ext/resolver/sockaddr/sockaddr_resolver.c 15 additions, 8 deletionssrc/core/ext/resolver/sockaddr/sockaddr_resolver.c
- src/core/ext/resolver/zookeeper/README.md 1 addition, 0 deletionssrc/core/ext/resolver/zookeeper/README.md
- src/core/ext/resolver/zookeeper/zookeeper_resolver.c 10 additions, 12 deletionssrc/core/ext/resolver/zookeeper/zookeeper_resolver.c
- src/core/lib/client_config/resolver_registry.c 15 additions, 7 deletionssrc/core/lib/client_config/resolver_registry.c
- src/core/lib/client_config/resolver_registry.h 4 additions, 0 deletionssrc/core/lib/client_config/resolver_registry.h
- src/core/lib/client_config/resolvers/dns_resolver.h 0 additions, 42 deletionssrc/core/lib/client_config/resolvers/dns_resolver.h
- src/core/lib/client_config/resolvers/sockaddr_resolver.h 0 additions, 50 deletionssrc/core/lib/client_config/resolvers/sockaddr_resolver.h
- src/core/lib/client_config/resolvers/zookeeper_resolver.h 0 additions, 42 deletionssrc/core/lib/client_config/resolvers/zookeeper_resolver.h
Loading
Please register or sign in to comment