diff options
author | Craig Tiller <ctiller@google.com> | 2016-06-07 13:00:14 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2016-06-07 13:00:14 -0700 |
commit | c97065da86ea140a86815575ce0f22d1ef45d576 (patch) | |
tree | 83686125dd2f3eaf055f5bb7e977222f22d14dfd /src/core/ext/census | |
parent | 2888bd58b00b30429470652b05bc2076785e8a99 (diff) | |
parent | d30d4e279c4a63effaa6e912fc00bd4ad96054c7 (diff) |
Merge github.com:grpc/grpc into error
Diffstat (limited to 'src/core/ext/census')
-rw-r--r-- | src/core/ext/census/grpc_filter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ext/census/grpc_filter.c b/src/core/ext/census/grpc_filter.c index b94e8e02bd..72e4e5427e 100644 --- a/src/core/ext/census/grpc_filter.c +++ b/src/core/ext/census/grpc_filter.c @@ -180,7 +180,7 @@ const grpc_channel_filter grpc_client_census_filter = { grpc_channel_next_op, sizeof(call_data), client_init_call_elem, - grpc_call_stack_ignore_set_pollset, + grpc_call_stack_ignore_set_pollset_or_pollset_set, client_destroy_call_elem, sizeof(channel_data), init_channel_elem, @@ -193,7 +193,7 @@ const grpc_channel_filter grpc_server_census_filter = { grpc_channel_next_op, sizeof(call_data), server_init_call_elem, - grpc_call_stack_ignore_set_pollset, + grpc_call_stack_ignore_set_pollset_or_pollset_set, server_destroy_call_elem, sizeof(channel_data), init_channel_elem, |