Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Grpc
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

a2b2ac80

Commit a2b2ac80 authored 8 years ago by Sree Kuchibhotla

Downloads
- Plain Diff

Merge branch 'master' into rpc_mgr

parents a7a21d20 1e70deaa

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/core/ext/client_config/client_config_plugin.c 1 addition, 5 deletions

src/core/ext/client_config/client_config_plugin.c
src/core/ext/client_config/resolver_registry.c 24 additions, 21 deletions

src/core/ext/client_config/resolver_registry.c
src/core/ext/client_config/resolver_registry.h 4 additions, 1 deletion

src/core/ext/client_config/resolver_registry.h
src/core/ext/lb_policy/grpclb/grpclb.c 2 additions, 4 deletions

src/core/ext/lb_policy/grpclb/grpclb.c
test/core/surface/channel_create_test.c 1 addition, 1 deletion

test/core/surface/channel_create_test.c
test/core/surface/secure_channel_create_test.c 1 addition, 1 deletion

test/core/surface/secure_channel_create_test.c

with 33 additions and 33 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment