diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-29 09:45:16 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-29 09:45:16 -0700 |
| commit | ad46ecfebabe79fe1941c54e8e7e46bb0e909fa3 (patch) | |
| tree | 565e63d7935a1ec638c0f474de67f7a3dca939b9 /Makefile | |
| parent | 8f8e9f9b53dee850c5ec7769df926fd6cad2a62e (diff) | |
| parent | 796474c792c3744c78d64a3d8430817782d03042 (diff) | |
Merge branch 'optionalize_roundrobin' into optionalize_census
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2430,7 +2430,7 @@ LIBGRPC_SRC = \ src/core/ext/census/placeholders.c \ src/core/ext/census/tracing.c \ src/core/ext/lb_policy/grpclb/load_balancer_api.c \ - src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \ + src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h \ src/core/ext/lb_policy/pick_first/pick_first.c \ src/core/ext/lb_policy/round_robin/round_robin.c \ src/core/ext/transport/chttp2/client/insecure/channel_create.c \ @@ -2792,7 +2792,7 @@ LIBGRPC_UNSECURE_SRC = \ src/core/ext/census/placeholders.c \ src/core/ext/census/tracing.c \ src/core/ext/lb_policy/grpclb/load_balancer_api.c \ - src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c \ + src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h \ src/core/ext/lb_policy/pick_first/pick_first.c \ src/core/ext/lb_policy/round_robin/round_robin.c \ src/core/ext/transport/chttp2/client/insecure/channel_create.c \ |