diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-08-28 12:53:57 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-08-28 12:53:57 -0700 |
| commit | 4b5b019d5644affef122e06c6898811286850b8d (patch) | |
| tree | 73c601dc31c436e3d800a846d08b9ace7ff05235 /src/core/ext/filters/client_channel/client_channel.cc | |
| parent | b8f030bc0b507903e9d156fb44d161015273d0c6 (diff) | |
| parent | ee65a5eaee45a765d1d4176a797bb8288faeb180 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channelz-subchannels
Diffstat (limited to 'src/core/ext/filters/client_channel/client_channel.cc')
| -rw-r--r-- | src/core/ext/filters/client_channel/client_channel.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index d3a4c49821..d015ceb335 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.cc @@ -3190,7 +3190,7 @@ static void cc_start_transport_stream_op_batch( // For all other batches, release the call combiner. if (grpc_client_channel_trace.enabled()) { gpr_log(GPR_INFO, - "chand=%p calld=%p: saved batch, yeilding call combiner", chand, + "chand=%p calld=%p: saved batch, yielding call combiner", chand, calld); } GRPC_CALL_COMBINER_STOP(calld->call_combiner, |