aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/grpc
diff options
context:
space:
mode:
authorGravatar ncteisen <ncteisen@gmail.com>2018-10-04 15:17:50 -0700
committerGravatar ncteisen <ncteisen@gmail.com>2018-10-04 15:17:50 -0700
commitcfe47deca438844140590ed44f23b3b80aa4cc1f (patch)
tree719d641534ab33d12ab0925418c15a031d73dac9 /include/grpc
parent8362e7042d4c7d41c756d85b4e64d499ae4e52ed (diff)
parentfbbf4593d69823b1a3d75e910c714a783116648f (diff)
Merge branch 'master' of https://github.com/grpc/grpc into channelz-server-sockets
Diffstat (limited to 'include/grpc')
-rw-r--r--include/grpc/impl/codegen/grpc_types.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/grpc/impl/codegen/grpc_types.h b/include/grpc/impl/codegen/grpc_types.h
index 9ed5b3c1d4..d1f8834d11 100644
--- a/include/grpc/impl/codegen/grpc_types.h
+++ b/include/grpc/impl/codegen/grpc_types.h
@@ -286,7 +286,7 @@ typedef struct {
/** The grpc_socket_factory instance to create and bind sockets. A pointer. */
#define GRPC_ARG_SOCKET_FACTORY "grpc.socket_factory"
/** The maximum number of trace events to keep in the tracer for each channel or
- * subchannel. The default is 10. If set to 0, channel tracing is disabled. */
+ * subchannel. The default is 0. If set to 0, channel tracing is disabled. */
#define GRPC_ARG_MAX_CHANNEL_TRACE_EVENTS_PER_NODE \
"grpc.max_channel_trace_events_per_node"
/** If non-zero, gRPC library will track stats and information at at per channel