diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-02-23 17:13:38 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-02-23 17:13:38 -0800 |
| commit | 4ea4599a50abb9188927846dc9f5449dbf5e8537 (patch) | |
| tree | 3e2bb7c622c6e847aeff2c8d4ca0022cefabaa35 /package.json | |
| parent | 19fa540100a1b9c28cb9ad6147d1e8d5f9659d82 (diff) | |
| parent | 0c24f974155809ce8524793c036c24493185fea8 (diff) | |
Merge github.com:grpc/grpc into naming-crisis
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/package.json b/package.json index d96e545818..4e7e83b02b 100644 --- a/package.json +++ b/package.json @@ -113,6 +113,7 @@ "src/core/client_config/client_config.h", "src/core/client_config/connector.h", "src/core/client_config/initial_connect_string.h", + "src/core/client_config/lb_policies/load_balancer_api.h", "src/core/client_config/lb_policies/pick_first.h", "src/core/client_config/lb_policies/round_robin.h", "src/core/client_config/lb_policy.h", @@ -173,6 +174,7 @@ "src/core/json/json_common.h", "src/core/json/json_reader.h", "src/core/json/json_writer.h", + "src/core/proto/grpc/lb/v0/load_balancer.pb.h", "src/core/statistics/census_interface.h", "src/core/statistics/census_rpc_stats.h", "src/core/surface/api_trace.h", @@ -229,6 +231,10 @@ "src/core/census/aggregation.h", "src/core/census/mlog.h", "src/core/census/rpc_metric_id.h", + "third_party/nanopb/pb.h", + "third_party/nanopb/pb_common.h", + "third_party/nanopb/pb_decode.h", + "third_party/nanopb/pb_encode.h", "src/core/census/grpc_context.c", "src/core/census/grpc_filter.c", "src/core/channel/channel_args.c", @@ -244,6 +250,7 @@ "src/core/client_config/connector.c", "src/core/client_config/default_initial_connect_string.c", "src/core/client_config/initial_connect_string.c", + "src/core/client_config/lb_policies/load_balancer_api.c", "src/core/client_config/lb_policies/pick_first.c", "src/core/client_config/lb_policies/round_robin.c", "src/core/client_config/lb_policy.c", @@ -308,6 +315,7 @@ "src/core/json/json_reader.c", "src/core/json/json_string.c", "src/core/json/json_writer.c", + "src/core/proto/grpc/lb/v0/load_balancer.pb.c", "src/core/surface/alarm.c", "src/core/surface/api_trace.c", "src/core/surface/byte_buffer.c", @@ -384,6 +392,9 @@ "src/core/census/operation.c", "src/core/census/placeholders.c", "src/core/census/tracing.c", + "third_party/nanopb/pb_common.c", + "third_party/nanopb/pb_decode.c", + "third_party/nanopb/pb_encode.c", "third_party/zlib/crc32.h", "third_party/zlib/deflate.h", "third_party/zlib/gzguts.h", |