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

5f1c4b58

Commit 5f1c4b58 authored 8 years ago by Mark D. Roth

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into service_config

parents 499b0121 9efab217

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/core/ext/client_config/lb_policy.h 12 additions, 9 deletions

src/core/ext/client_config/lb_policy.h
src/core/ext/lb_policy/grpclb/grpclb.c 1 addition, 1 deletion

src/core/ext/lb_policy/grpclb/grpclb.c
src/core/ext/transport/cronet/transport/cronet_transport.c 1 addition, 1 deletion

src/core/ext/transport/cronet/transport/cronet_transport.c

with 14 additions and 11 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