diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-04-05 07:46:01 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-04-05 07:46:01 -0700 |
| commit | 0b0147c4574ca04d43e1d5e50922880e2ff3ec33 (patch) | |
| tree | d24d2747b10060eaf9b11a44c89fbc5ed5a30ffe /src/core/ext/client_config | |
| parent | c53ac0b59e615bb7d0ef736f0c42facff5525883 (diff) | |
| parent | d82245adec17fbe957b5f452a8ac47be122c63cd (diff) | |
Merge branch 'subchannel_factory_create_lb_channel' of github.com:dgquintas/grpc into optionalize_client_config
Diffstat (limited to 'src/core/ext/client_config')
| -rw-r--r-- | src/core/ext/client_config/client_channel_factory.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/core/ext/client_config/client_channel_factory.h b/src/core/ext/client_config/client_channel_factory.h index 42a3034c78..836c1ba2f0 100644 --- a/src/core/ext/client_config/client_channel_factory.h +++ b/src/core/ext/client_config/client_channel_factory.h @@ -34,7 +34,6 @@ #ifndef GRPC_CORE_LIB_CLIENT_CONFIG_CLIENT_CHANNEL_FACTORY_H #define GRPC_CORE_LIB_CLIENT_CONFIG_CLIENT_CHANNEL_FACTORY_H -#include <grpc/grpc_security.h> #include <grpc/impl/codegen/grpc_types.h> #include "src/core/ext/client_config/subchannel.h" |