diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-10-04 16:06:19 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-10-04 16:06:19 -0700 |
| commit | 867192e29e15fab9e3d8052ecb8b31d9177b24cf (patch) | |
| tree | c1cbdc5ef8a2154bcbeee9ba700201ed04d985ab /include/grpc | |
| parent | a64cb54de152017d6c3c968ec9c22a98c405a8ba (diff) | |
| parent | fbbf4593d69823b1a3d75e910c714a783116648f (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channel-trace-size
Diffstat (limited to 'include/grpc')
| -rw-r--r-- | include/grpc/impl/codegen/grpc_types.h | 2 |
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 672f130bab..42daf3bb6e 100644 --- a/include/grpc/impl/codegen/grpc_types.h +++ b/include/grpc/impl/codegen/grpc_types.h @@ -290,7 +290,7 @@ typedef struct { * oldest events from the buffer. The unit for this knob is bytes. Setting * it to zero causes channel tracing to be disabled. */ #define GRPC_ARG_MAX_CHANNEL_TRACE_EVENT_MEMORY_PER_NODE \ - "grpc.max_channel_trace_events_per_node" + "grpc.max_channel_trace_event_memory_per_node" /** If non-zero, gRPC library will track stats and information at at per channel * level. Disabling channelz naturally disables channel tracing. The default * is for channelz to be disabled. */ |