aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar Mark D. Roth <roth@google.com>2016-07-21 11:20:40 -0700
committerGravatar Mark D. Roth <roth@google.com>2016-07-21 11:20:40 -0700
commit3b17e44eb36f12e3ece8eceb547c804471843892 (patch)
tree3220a2802c9f85115d5d90e113296a67c6e71528 /src/core
parentac8df657a56cbb8010eec54755051da0a333cd0e (diff)
parent4f8c76d959e6b760f0a1505eb12549998d80112e (diff)
Merge remote-tracking branch 'upstream/master' into handshake_api
Diffstat (limited to 'src/core')
-rw-r--r--src/core/ext/client_config/channel_connectivity.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ext/client_config/channel_connectivity.c b/src/core/ext/client_config/channel_connectivity.c
index c1220e3a8c..ce3c13a4ee 100644
--- a/src/core/ext/client_config/channel_connectivity.c
+++ b/src/core/ext/client_config/channel_connectivity.c
@@ -59,7 +59,7 @@ grpc_connectivity_state grpc_channel_check_connectivity_state(
}
gpr_log(GPR_ERROR,
"grpc_channel_check_connectivity_state called on something that is "
- "not a (u)client channel, but '%s'",
+ "not a client channel, but '%s'",
client_channel_elem->filter->name);
grpc_exec_ctx_finish(&exec_ctx);
return GRPC_CHANNEL_SHUTDOWN;