Merge branch 'master' into rq-threads-2

1 files changed, 5 insertions, 0 deletions

diff --git a/include/grpc/grpc.h b/include/grpc/grpc.h
index c54e884439..dc22008932 100644
--- a/include/grpc/grpc.h
+++ b/include/grpc/grpc.h
@@ -274,6 +274,11 @@ GRPCAPI char* grpc_channel_get_target(grpc_channel* channel);
 GRPCAPI void grpc_channel_get_info(grpc_channel* channel,
                                    const grpc_channel_info* channel_info);
 
+/** EXPERIMENTAL.  Resets the channel's connect backoff.
+    TODO(roth): When we see whether this proves useful, either promote
+    to non-experimental or remove it. */
+GRPCAPI void grpc_channel_reset_connect_backoff(grpc_channel* channel);
+
 /** Create a client channel to 'target'. Additional channel level configuration
     MAY be provided by grpc_channel_args, though the expectation is that most
     clients will want to simply pass NULL. The user data in 'args' need only