diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-06-02 16:55:54 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-02 16:55:54 -0700 |
| commit | a4b89fed1c801cdb31a154c7e1c09e5650898e8a (patch) | |
| tree | d0a00563db8df1da5d69dee362664a85112f20cb /src/core/surface/secure_channel_create.c | |
| parent | aaa03d74ceae4d48e31f4ba0619e359acd21505a (diff) | |
| parent | c86b1dd59d1e61b9377f2dca0741061b2e5de1da (diff) | |
Merge github.com:grpc/grpc into you-complete-me
Conflicts:
src/core/iomgr/resolve_address_posix.c
src/core/surface/server.c
Diffstat (limited to 'src/core/surface/secure_channel_create.c')
| -rw-r--r-- | src/core/surface/secure_channel_create.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index a71d12291e..8ef121dc48 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -234,9 +234,10 @@ grpc_channel *grpc_secure_channel_create(grpc_credentials *creds, new_args_from_connector != NULL ? new_args_from_connector : args, &connector_arg); filters[n++] = &grpc_client_surface_filter; + /* TODO(census) if (grpc_channel_args_is_census_enabled(args)) { filters[n++] = &grpc_client_census_filter; - } + } */ filters[n++] = &grpc_client_channel_filter; GPR_ASSERT(n <= MAX_FILTERS); channel = grpc_channel_create_from_filters(filters, n, args_copy, mdctx, 1); |