Merge branch 'subchannel_factory_create_lb_channel' of github.com:dgquintas/grpc into optionalize_client_config

9 years ago · 0b0147c457
parent c53ac0b59e d82245adec
commit 0b0147c457
1 changed files with 0 additions and 1 deletions
--- 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"