diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-13 11:17:33 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-13 11:17:33 -0700 |
| commit | d316beff3c9c135ec1e60bf9182f7968e73790c6 (patch) | |
| tree | a9656e5e252a9afde6584c16e7ea52f1d3492d14 /src/core/ext/client_config/client_channel.c | |
| parent | 673de79a0e4ad81eae7b371a5dfd3313487801c5 (diff) | |
| parent | 1beb35b24b277598b9101f122de4cf8400973e96 (diff) | |
Merge branch 'grpclb_resolver_changes2' into service_config
Diffstat (limited to 'src/core/ext/client_config/client_channel.c')
0 files changed, 0 insertions, 0 deletions