Merge branch 'master' of github.com:grpc/grpc into subchannel_factory…

…_create_lb_channel
narzolliam · Apr 1, 2016 · 86fcfcc · 86fcfcc
2 parents fcf7ad6 + 7661da5
commit 86fcfcc
Show file tree

Hide file tree

Showing 1,245 changed files with 23,528 additions and 1,876 deletions.
diff --git a/BUILD b/BUILD
@@ -159,6 +159,8 @@ cc_library(
 cc_library(
  name = "grpc",
  srcs = [
+ "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/ext/transport/chttp2/transport/alpn.h",
  "src/core/ext/transport/chttp2/transport/bin_encoder.h",
  "src/core/ext/transport/chttp2/transport/chttp2_transport.h",
@@ -199,9 +201,6 @@ cc_library(
  "src/core/lib/client_config/client_config.h",
  "src/core/lib/client_config/connector.h",
  "src/core/lib/client_config/initial_connect_string.h",
- "src/core/lib/client_config/lb_policies/load_balancer_api.h",
- "src/core/lib/client_config/lb_policies/pick_first.h",
- "src/core/lib/client_config/lb_policies/round_robin.h",
  "src/core/lib/client_config/lb_policy.h",
  "src/core/lib/client_config/lb_policy_factory.h",
  "src/core/lib/client_config/lb_policy_registry.h",
@@ -260,7 +259,6 @@ cc_library(
  "src/core/lib/json/json_common.h",
  "src/core/lib/json/json_reader.h",
  "src/core/lib/json/json_writer.h",
- "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/lib/security/auth_filters.h",
  "src/core/lib/security/b64.h",
  "src/core/lib/security/credentials.h",
@@ -296,6 +294,10 @@ cc_library(
  "src/core/lib/tsi/ssl_types.h",
  "src/core/lib/tsi/transport_security.h",
  "src/core/lib/tsi/transport_security_interface.h",
+ "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/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",
  "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c",
  "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c",
@@ -344,9 +346,6 @@ cc_library(
  "src/core/lib/client_config/connector.c",
  "src/core/lib/client_config/default_initial_connect_string.c",
  "src/core/lib/client_config/initial_connect_string.c",
- "src/core/lib/client_config/lb_policies/load_balancer_api.c",
- "src/core/lib/client_config/lb_policies/pick_first.c",
- "src/core/lib/client_config/lb_policies/round_robin.c",
  "src/core/lib/client_config/lb_policy.c",
  "src/core/lib/client_config/lb_policy_factory.c",
  "src/core/lib/client_config/lb_policy_registry.c",
@@ -411,7 +410,6 @@ cc_library(
  "src/core/lib/json/json_reader.c",
  "src/core/lib/json/json_string.c",
  "src/core/lib/json/json_writer.c",
- "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/lib/security/b64.c",
  "src/core/lib/security/client_auth_filter.c",
  "src/core/lib/security/credentials.c",
@@ -457,6 +455,7 @@ cc_library(
  "src/core/lib/tsi/fake_transport_security.c",
  "src/core/lib/tsi/ssl_transport_security.c",
  "src/core/lib/tsi/transport_security.c",
+ "src/core/plugin_registry/grpc_plugin_registry.c",
  ],
  hdrs = [
  "include/grpc/byte_buffer.h",
@@ -530,6 +529,8 @@ cc_library(
 cc_library(
  name = "grpc_unsecure",
  srcs = [
+ "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/ext/transport/chttp2/transport/alpn.h",
  "src/core/ext/transport/chttp2/transport/bin_encoder.h",
  "src/core/ext/transport/chttp2/transport/chttp2_transport.h",
@@ -570,9 +571,6 @@ cc_library(
  "src/core/lib/client_config/client_config.h",
  "src/core/lib/client_config/connector.h",
  "src/core/lib/client_config/initial_connect_string.h",
- "src/core/lib/client_config/lb_policies/load_balancer_api.h",
- "src/core/lib/client_config/lb_policies/pick_first.h",
- "src/core/lib/client_config/lb_policies/round_robin.h",
  "src/core/lib/client_config/lb_policy.h",
  "src/core/lib/client_config/lb_policy_factory.h",
  "src/core/lib/client_config/lb_policy_registry.h",
@@ -631,7 +629,6 @@ cc_library(
  "src/core/lib/json/json_common.h",
  "src/core/lib/json/json_reader.h",
  "src/core/lib/json/json_writer.h",
- "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/lib/statistics/census_interface.h",
  "src/core/lib/statistics/census_rpc_stats.h",
  "src/core/lib/surface/api_trace.h",
@@ -653,6 +650,10 @@ cc_library(
  "src/core/lib/transport/static_metadata.h",
  "src/core/lib/transport/transport.h",
  "src/core/lib/transport/transport_impl.h",
+ "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/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",
  "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c",
  "src/core/ext/transport/chttp2/transport/alpn.c",
@@ -699,9 +700,6 @@ cc_library(
  "src/core/lib/client_config/connector.c",
  "src/core/lib/client_config/default_initial_connect_string.c",
  "src/core/lib/client_config/initial_connect_string.c",
- "src/core/lib/client_config/lb_policies/load_balancer_api.c",
- "src/core/lib/client_config/lb_policies/pick_first.c",
- "src/core/lib/client_config/lb_policies/round_robin.c",
  "src/core/lib/client_config/lb_policy.c",
  "src/core/lib/client_config/lb_policy_factory.c",
  "src/core/lib/client_config/lb_policy_registry.c",
@@ -765,7 +763,6 @@ cc_library(
  "src/core/lib/json/json_reader.c",
  "src/core/lib/json/json_string.c",
  "src/core/lib/json/json_writer.c",
- "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/lib/surface/alarm.c",
  "src/core/lib/surface/api_trace.c",
  "src/core/lib/surface/byte_buffer.c",
@@ -794,6 +791,7 @@ cc_library(
  "src/core/lib/transport/static_metadata.c",
  "src/core/lib/transport/transport.c",
  "src/core/lib/transport/transport_op_string.c",
+ "src/core/plugin_registry/grpc_unsecure_plugin_registry.c",
  ],
  hdrs = [
  "include/grpc/byte_buffer.h",
@@ -1361,6 +1359,10 @@ objc_library(
 objc_library(
  name = "grpc_objc",
  srcs = [
+ "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/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",
  "src/core/ext/transport/chttp2/client/secure/secure_channel_create.c",
  "src/core/ext/transport/chttp2/server/insecure/server_chttp2.c",
@@ -1409,9 +1411,6 @@ objc_library(
  "src/core/lib/client_config/connector.c",
  "src/core/lib/client_config/default_initial_connect_string.c",
  "src/core/lib/client_config/initial_connect_string.c",
- "src/core/lib/client_config/lb_policies/load_balancer_api.c",
- "src/core/lib/client_config/lb_policies/pick_first.c",
- "src/core/lib/client_config/lb_policies/round_robin.c",
  "src/core/lib/client_config/lb_policy.c",
  "src/core/lib/client_config/lb_policy_factory.c",
  "src/core/lib/client_config/lb_policy_registry.c",
@@ -1476,7 +1475,6 @@ objc_library(
  "src/core/lib/json/json_reader.c",
  "src/core/lib/json/json_string.c",
  "src/core/lib/json/json_writer.c",
- "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c",
  "src/core/lib/security/b64.c",
  "src/core/lib/security/client_auth_filter.c",
  "src/core/lib/security/credentials.c",
@@ -1522,6 +1520,7 @@ objc_library(
  "src/core/lib/tsi/fake_transport_security.c",
  "src/core/lib/tsi/ssl_transport_security.c",
  "src/core/lib/tsi/transport_security.c",
+ "src/core/plugin_registry/grpc_plugin_registry.c",
  ],
  hdrs = [
  "include/grpc/byte_buffer.h",
@@ -1537,6 +1536,8 @@ objc_library(
  "include/grpc/impl/codegen/propagation_bits.h",
  "include/grpc/impl/codegen/status.h",
  "include/grpc/status.h",
+ "src/core/ext/lb_policy/grpclb/load_balancer_api.h",
+ "src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/ext/transport/chttp2/transport/alpn.h",
  "src/core/ext/transport/chttp2/transport/bin_encoder.h",
  "src/core/ext/transport/chttp2/transport/chttp2_transport.h",
@@ -1577,9 +1578,6 @@ objc_library(
  "src/core/lib/client_config/client_config.h",
  "src/core/lib/client_config/connector.h",
  "src/core/lib/client_config/initial_connect_string.h",
- "src/core/lib/client_config/lb_policies/load_balancer_api.h",
- "src/core/lib/client_config/lb_policies/pick_first.h",
- "src/core/lib/client_config/lb_policies/round_robin.h",
  "src/core/lib/client_config/lb_policy.h",
  "src/core/lib/client_config/lb_policy_factory.h",
  "src/core/lib/client_config/lb_policy_registry.h",
@@ -1638,7 +1636,6 @@ objc_library(
  "src/core/lib/json/json_common.h",
  "src/core/lib/json/json_reader.h",
  "src/core/lib/json/json_writer.h",
- "src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h",
  "src/core/lib/security/auth_filters.h",
  "src/core/lib/security/b64.h",
  "src/core/lib/security/credentials.h",

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2015-2016, Google Inc.
+Copyright 2015, Google Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without