aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/ext/client_config/subchannel.h
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-05-18 23:04:11 -0700
committerGravatar Craig Tiller <ctiller@google.com>2016-05-18 23:04:11 -0700
commit147a9f2ead25916a84c1145d1b250992e76463be (patch)
tree3a3149a38625e090d70c626186d7803f9bce064a /src/core/ext/client_config/subchannel.h
parent9766f4f42482155c5442bd5e3c065ec68caa7a1f (diff)
parentef96264d8724a71f4f1fef5ebaf361d28b1a1752 (diff)
Merge branch 'reuse_port' into reuse_affinity
Diffstat (limited to 'src/core/ext/client_config/subchannel.h')
-rw-r--r--src/core/ext/client_config/subchannel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ext/client_config/subchannel.h b/src/core/ext/client_config/subchannel.h
index 0765a544e8..e73f394584 100644
--- a/src/core/ext/client_config/subchannel.h
+++ b/src/core/ext/client_config/subchannel.h
@@ -118,7 +118,7 @@ void grpc_connected_subchannel_process_transport_op(
/** poll the current connectivity state of a channel */
grpc_connectivity_state grpc_subchannel_check_connectivity(
- grpc_subchannel *channel);
+ grpc_subchannel *channel, grpc_error **error);
/** call notify when the connectivity state of a channel changes from *state.
Updates *state with the new state of the channel */