diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-04-01 16:36:27 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-04-01 16:36:27 -0700 |
| commit | 74071cdab0c9a4016c05d371fdf1ec0d772ed0b7 (patch) | |
| tree | 4cd5b95b661ddcdc33729622d5fdb63be4bb4f3a /Makefile | |
| parent | 92b74082811902e4ab9482a5229defd3014aad3f (diff) | |
| parent | b48dda25913fbf6fcb0a7c86ecc364beb31ff43b (diff) | |
Merge branch 'subchannel_factory_create_lb_channel' of github.com:dgquintas/grpc into ccmerge
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2449,6 +2449,7 @@ LIBGRPC_SRC = \ src/core/ext/census/tracing.c \ src/core/ext/client_config/channel_connectivity.c \ src/core/ext/client_config/client_channel.c \ + src/core/ext/client_config/client_channel_factory.c \ src/core/ext/client_config/client_config.c \ src/core/ext/client_config/connector.c \ src/core/ext/client_config/default_initial_connect_string.c \ @@ -2460,7 +2461,6 @@ LIBGRPC_SRC = \ src/core/ext/client_config/resolver_factory.c \ src/core/ext/client_config/resolver_registry.c \ src/core/ext/client_config/subchannel.c \ - src/core/ext/client_config/subchannel_factory.c \ src/core/ext/client_config/subchannel_index.c \ src/core/ext/client_config/uri_parser.c \ src/core/ext/lb_policy/grpclb/load_balancer_api.c \ @@ -2808,6 +2808,7 @@ LIBGRPC_UNSECURE_SRC = \ src/core/ext/census/tracing.c \ src/core/ext/client_config/channel_connectivity.c \ src/core/ext/client_config/client_channel.c \ + src/core/ext/client_config/client_channel_factory.c \ src/core/ext/client_config/client_config.c \ src/core/ext/client_config/connector.c \ src/core/ext/client_config/default_initial_connect_string.c \ @@ -2819,7 +2820,6 @@ LIBGRPC_UNSECURE_SRC = \ src/core/ext/client_config/resolver_factory.c \ src/core/ext/client_config/resolver_registry.c \ src/core/ext/client_config/subchannel.c \ - src/core/ext/client_config/subchannel_factory.c \ src/core/ext/client_config/subchannel_index.c \ src/core/ext/client_config/uri_parser.c \ src/core/ext/lb_policy/grpclb/load_balancer_api.c \ |