diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-06-24 09:23:52 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-06-24 09:23:52 -0700 |
| commit | 7df28a7bd2b71684eea2a20f55df91a592fdfed6 (patch) | |
| tree | cb754c3fb01986c4cb1698413832b828ad02d73e /Makefile | |
| parent | 009886cf79bd4bf53049633ef7797eb63be30b68 (diff) | |
| parent | d9145d91f542e838827dfdd83978586e2686973f (diff) | |
Merge github.com:grpc/grpc into that-which-we-call-a-rose
Introduce resolver_factory
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -3023,6 +3023,7 @@ LIBGRPC_SRC = \ src/core/client_config/client_config.c \ src/core/client_config/lb_policy.c \ src/core/client_config/resolver.c \ + src/core/client_config/resolver_factory.c \ src/core/client_config/subchannel.c \ src/core/client_config/subchannel_factory.c \ src/core/compression/algorithm.c \ @@ -3274,6 +3275,7 @@ LIBGRPC_UNSECURE_SRC = \ src/core/client_config/client_config.c \ src/core/client_config/lb_policy.c \ src/core/client_config/resolver.c \ + src/core/client_config/resolver_factory.c \ src/core/client_config/subchannel.c \ src/core/client_config/subchannel_factory.c \ src/core/compression/algorithm.c \ |