diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-12 16:59:00 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-12 16:59:00 -0700 |
| commit | 5e1b58bcea0d34a5e21e990cf98b64f432b87121 (patch) | |
| tree | 9a227e98b72243ff2565db2da8e86d7a29085f4a /src/core/lib/surface/init.c | |
| parent | 242dc4be0e58a974f5f5852f498b0d55e0771887 (diff) | |
| parent | 6e51f992c6bfdfba61d984ab173305da455bd2e7 (diff) | |
Merge remote-tracking branch 'upstream/master' into deadline_filter
Diffstat (limited to 'src/core/lib/surface/init.c')
| -rw-r--r-- | src/core/lib/surface/init.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/core/lib/surface/init.c b/src/core/lib/surface/init.c index 9520006d86..158dca0964 100644 --- a/src/core/lib/surface/init.c +++ b/src/core/lib/surface/init.c @@ -48,7 +48,6 @@ #include "src/core/lib/channel/http_server_filter.h" #include "src/core/lib/debug/trace.h" #include "src/core/lib/http/parser.h" -#include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/profiling/timers.h" @@ -173,7 +172,6 @@ void grpc_init(void) { grpc_register_tracer("http1", &grpc_http1_trace); grpc_register_tracer("compression", &grpc_compression_trace); grpc_register_tracer("queue_pluck", &grpc_cq_pluck_trace); - grpc_register_tracer("combiner", &grpc_combiner_trace); // Default pluck trace to 1 grpc_cq_pluck_trace = 1; grpc_register_tracer("queue_timeout", &grpc_cq_event_timeout_trace); |