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

49e405ac

Commit 49e405ac authored 8 years ago by Mark D. Roth

Downloads
- Plain Diff

Merge branch 'fake_resolver' into service_config

parents 0b259a83 95c71437

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/core/ext/client_config/client_channel.c 3 additions, 2 deletions

src/core/ext/client_config/client_channel.c
src/core/ext/resolver/sockaddr/sockaddr_resolver.c 8 additions, 6 deletions

src/core/ext/resolver/sockaddr/sockaddr_resolver.c
test/core/end2end/fake_resolver.c 4 additions, 4 deletions

test/core/end2end/fake_resolver.c
tools/run_tests/sources_and_headers.json 1 addition, 0 deletions

tools/run_tests/sources_and_headers.json
tools/run_tests/tests.json 42 additions, 0 deletions

tools/run_tests/tests.json

with 58 additions and 12 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