Skip to content
Snippets Groups Projects
Commit 0b0147c4 authored by Craig Tiller's avatar Craig Tiller
Browse files

Merge branch 'subchannel_factory_create_lb_channel' of... 

Merge branch 'subchannel_factory_create_lb_channel' of github.com:dgquintas/grpc into optionalize_client_config
parents c53ac0b5 d82245ad
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/core/ext/client_config/client_channel_factory.h
+ 0
− 1
View file @ 0b0147c4
......@@ -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"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment