Merge github.com:grpc/grpc into split-me-baby-one-more-time

9 years ago · c532c21ee5
parent 3b27de1fc4 02f5f8de36
commit c532c21ee5
1194 changed files with 1593 additions and 1488 deletions
--- a/45
+++ b/45
@ -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",
@ -198,9 +200,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",
@ -343,9 +345,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",
@ -569,9 +570,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",
@ -698,9 +699,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",
@ -1408,9 +1410,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",
@ -1576,9 +1577,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",
--- a/2
+++ b/2
@ -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
--- a/21
+++ b/21
@ -5,7 +5,7 @@
 # This file can be regenerated from the template by running
 # tools/buildgen/generate_projects.sh

-# Copyright 2015-2016, Google Inc.
+# Copyright 2015, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@ -2440,6 +2440,10 @@ endif


 LIBGRPC_SRC = \
+    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 \
@ -2487,9 +2491,6 @@ LIBGRPC_SRC = \
    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 \
@ -2555,7 +2556,6 @@ LIBGRPC_SRC = \
    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 \
@ -2601,6 +2601,7 @@ LIBGRPC_SRC = \
    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 \
    third_party/nanopb/pb_common.c \
    third_party/nanopb/pb_decode.c \
    third_party/nanopb/pb_encode.c \
@ -2801,6 +2802,10 @@ endif


 LIBGRPC_UNSECURE_SRC = \
+    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 \
@ -2846,9 +2851,6 @@ LIBGRPC_UNSECURE_SRC = \
    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 \
@ -2913,7 +2915,6 @@ LIBGRPC_UNSECURE_SRC = \
    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 \
@ -2942,6 +2943,7 @@ LIBGRPC_UNSECURE_SRC = \
    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 \
    third_party/nanopb/pb_common.c \
    third_party/nanopb/pb_decode.c \
    third_party/nanopb/pb_encode.c \
@ -13738,6 +13740,7 @@ src/core/lib/surface/init_secure.c: $(OPENSSL_DEP)
 src/core/lib/tsi/fake_transport_security.c: $(OPENSSL_DEP)
 src/core/lib/tsi/ssl_transport_security.c: $(OPENSSL_DEP)
 src/core/lib/tsi/transport_security.c: $(OPENSSL_DEP)
+src/core/plugin_registry/grpc_plugin_registry.c: $(OPENSSL_DEP)
 src/cpp/client/secure_credentials.cc: $(OPENSSL_DEP)
 src/cpp/common/auth_property_iterator.cc: $(OPENSSL_DEP)
 src/cpp/common/secure_auth_context.cc: $(OPENSSL_DEP)
--- a/binding.gyp
+++ b/binding.gyp
@ -5,7 +5,7 @@
 # This file can be regenerated from the template by running
 # tools/buildgen/generate_projects.sh

-# Copyright 2015-2016, Google Inc.
+# Copyright 2015, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@ -558,6 +558,10 @@
        'gpr',
      ],
      'sources': [
+        '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',
@ -605,9 +609,6 @@
        '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',
@ -673,7 +674,6 @@
        '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',
@ -719,6 +719,7 @@
        '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',
        'third_party/nanopb/pb_common.c',
        'third_party/nanopb/pb_decode.c',
        'third_party/nanopb/pb_encode.c',
--- a/build.yaml
+++ b/build.yaml
@ -262,9 +262,6 @@ filegroups:
  - 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
@ -324,7 +321,6 @@ filegroups:
  - 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
@ -363,9 +359,6 @@ filegroups:
  - 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
@ -430,7 +423,6 @@ filegroups:
  - 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
@ -466,6 +458,27 @@ filegroups:
  - include/grpc/impl/codegen/grpc_types.h
  - include/grpc/impl/codegen/propagation_bits.h
  - include/grpc/impl/codegen/status.h
+- name: grpc_lb_policy_grpclb
+  headers:
+  - 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:
+  - src/core/ext/lb_policy/grpclb/load_balancer_api.c
+  - src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c
+  uses:
+  - grpc_base
+- name: grpc_lb_policy_pick_first
+  src:
+  - src/core/ext/lb_policy/pick_first/pick_first.c
+  plugin: grpc_lb_policy_pick_first
+  uses:
+  - grpc_base
+- name: grpc_lb_policy_round_robin
+  src:
+  - src/core/ext/lb_policy/round_robin/round_robin.c
+  plugin: grpc_lb_policy_round_robin
+  uses:
+  - grpc_base
 - name: grpc_secure
  headers:
  - src/core/lib/security/auth_filters.h
@ -639,10 +652,14 @@ libs:
  - grpc_transport_chttp2_client_secure
  - grpc_transport_chttp2_server_insecure
  - grpc_transport_chttp2_client_insecure
+  - grpc_lb_policy_grpclb
+  - grpc_lb_policy_pick_first
+  - grpc_lb_policy_round_robin
  - grpc_secure
  - grpc_codegen
  - census
  - nanopb
+  generate_plugin_registry: true
  secure: true
  vs_packages:
  - grpc.dependencies.openssl
@ -722,9 +739,13 @@ libs:
  - grpc_base
  - grpc_transport_chttp2_server_insecure
  - grpc_transport_chttp2_client_insecure
+  - grpc_lb_policy_grpclb
+  - grpc_lb_policy_pick_first
+  - grpc_lb_policy_round_robin
  - grpc_codegen
  - census
  - nanopb
+  generate_plugin_registry: true
  secure: false
  vs_project_guid: '{46CEDFFF-9692-456A-AA24-38B5D6BCF4C5}'
 - name: grpc_zookeeper
--- a/config.m4
+++ b/config.m4
@ -80,6 +80,10 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/support/tmpfile_posix.c \
    src/core/lib/support/tmpfile_win32.c \
    src/core/lib/support/wrap_memcpy.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/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 \
@ -127,9 +131,6 @@ if test "$PHP_GRPC" != "no"; then
    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 \
@ -195,7 +196,6 @@ if test "$PHP_GRPC" != "no"; then
    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 \
@ -241,6 +241,7 @@ if test "$PHP_GRPC" != "no"; then
    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 \
    third_party/nanopb/pb_common.c \
    third_party/nanopb/pb_decode.c \
    third_party/nanopb/pb_encode.c \
@ -546,6 +547,10 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/php/ext/grpc)

  PHP_ADD_BUILD_DIR($ext_builddir/src/boringssl)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/grpclb)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/pick_first)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/lb_policy/round_robin)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/client/insecure)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/client/secure)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/transport/chttp2/server/insecure)
@ -554,7 +559,6 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/census)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/channel)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/client_config)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/client_config/lb_policies)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/client_config/resolvers)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/compression)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/debug)
@ -562,12 +566,12 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/json)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/profiling)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/proto/grpc/lb/v0)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/support)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/surface)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/transport)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/tsi)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/plugin_registry)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/aes)
  PHP_ADD_BUILD_DIR($ext_builddir/third_party/boringssl/crypto/asn1)
--- a/examples/cpp/helloworld/Makefile
+++ b/examples/cpp/helloworld/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Google Inc.
+# Copyright 2015, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
--- a/examples/cpp/helloworld/greeter_async_server.cc
+++ b/examples/cpp/helloworld/greeter_async_server.cc
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/examples/cpp/route_guide/Makefile
+++ b/examples/cpp/route_guide/Makefile
@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016, Google Inc.
+# Copyright 2015, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
--- a/examples/csharp/helloworld/GreeterClient/Program.cs
+++ b/examples/csharp/helloworld/GreeterClient/Program.cs
@ -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
--- a/examples/csharp/route_guide/RouteGuideClient/Program.cs
+++ b/examples/csharp/route_guide/RouteGuideClient/Program.cs
@ -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
--- a/examples/node/greeter_client.js
+++ b/examples/node/greeter_client.js
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/examples/node/greeter_server.js
+++ b/examples/node/greeter_server.js
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/examples/node/route_guide/route_guide_client.js
+++ b/examples/node/route_guide/route_guide_client.js
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/examples/node/route_guide/route_guide_server.js
+++ b/examples/node/route_guide/route_guide_server.js
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/examples/objective-c/auth_sample/MakeRPCViewController.m
+++ b/examples/objective-c/auth_sample/MakeRPCViewController.m
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/examples/objective-c/helloworld/main.m
+++ b/examples/objective-c/helloworld/main.m
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/examples/php/greeter_client.php
+++ b/examples/php/greeter_client.php
@ -1,7 +1,7 @@
 <?php
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/examples/php/route_guide/route_guide_client.php
+++ b/examples/php/route_guide/route_guide_client.php
@ -1,7 +1,7 @@
 <?php
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/examples/protos/helloworld.proto
+++ b/examples/protos/helloworld.proto
@ -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
--- a/examples/protos/route_guide.proto
+++ b/examples/protos/route_guide.proto
@ -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
--- a/examples/python/helloworld/greeter_client.py
+++ b/examples/python/helloworld/greeter_client.py
@ -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
--- a/examples/python/route_guide/route_guide_client.py
+++ b/examples/python/route_guide/route_guide_client.py
@ -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
--- a/examples/python/route_guide/route_guide_server.py
+++ b/examples/python/route_guide/route_guide_server.py
@ -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
--- a/examples/ruby/greeter_client.rb
+++ b/examples/ruby/greeter_client.rb
@ -1,6 +1,6 @@
 #!/usr/bin/env ruby

-# Copyright 2015-2016, Google Inc.
+# Copyright 2015, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
--- a/examples/ruby/route_guide/route_guide_client.rb
+++ b/examples/ruby/route_guide/route_guide_client.rb
@ -1,6 +1,6 @@
 #!/usr/bin/env ruby

-# Copyright 2015-2016, Google Inc.
+# Copyright 2015, Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
--- a/gRPC.podspec
+++ b/gRPC.podspec
@ -161,6 +161,8 @@ Pod::Spec.new do |s|
                      'src/core/lib/support/tmpfile_posix.c',
                      'src/core/lib/support/tmpfile_win32.c',
                      'src/core/lib/support/wrap_memcpy.c',
+                      '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',
@ -200,9 +202,6 @@ Pod::Spec.new do |s|
                      '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',
@ -262,7 +261,6 @@ Pod::Spec.new do |s|
                      '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',
@ -315,6 +313,10 @@ Pod::Spec.new do |s|
                      '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.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',
@ -362,9 +364,6 @@ Pod::Spec.new do |s|
                      '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',
@ -430,7 +429,6 @@ Pod::Spec.new do |s|
                      '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',
@ -476,6 +474,7 @@ Pod::Spec.new do |s|
                      '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',
                      'third_party/nanopb/pb_common.c',
                      'third_party/nanopb/pb_decode.c',
                      'third_party/nanopb/pb_encode.c'
@ -492,6 +491,8 @@ Pod::Spec.new do |s|
                              'src/core/lib/support/thd_internal.h',
                              'src/core/lib/support/time_precise.h',
                              'src/core/lib/support/tmpfile.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',
@ -531,9 +532,6 @@ Pod::Spec.new do |s|
                              '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',
@ -593,7 +591,6 @@ Pod::Spec.new do |s|
                              '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',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -157,6 +157,8 @@ Gem::Specification.new do |s|
  s.files += %w( include/grpc/impl/codegen/propagation_bits.h )
  s.files += %w( include/grpc/impl/codegen/status.h )
  s.files += %w( include/grpc/status.h )
+  s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.h )
+  s.files += %w( src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.h )
  s.files += %w( src/core/ext/transport/chttp2/transport/alpn.h )
  s.files += %w( src/core/ext/transport/chttp2/transport/bin_encoder.h )
  s.files += %w( src/core/ext/transport/chttp2/transport/chttp2_transport.h )
@ -196,9 +198,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/client_config/client_config.h )
  s.files += %w( src/core/lib/client_config/connector.h )
  s.files += %w( src/core/lib/client_config/initial_connect_string.h )
-  s.files += %w( src/core/lib/client_config/lb_policies/load_balancer_api.h )
-  s.files += %w( src/core/lib/client_config/lb_policies/pick_first.h )
-  s.files += %w( src/core/lib/client_config/lb_policies/round_robin.h )
  s.files += %w( src/core/lib/client_config/lb_policy.h )
  s.files += %w( src/core/lib/client_config/lb_policy_factory.h )
  s.files += %w( src/core/lib/client_config/lb_policy_registry.h )
@ -258,7 +257,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/json/json_common.h )
  s.files += %w( src/core/lib/json/json_reader.h )
  s.files += %w( src/core/lib/json/json_writer.h )
-  s.files += %w( src/core/lib/proto/grpc/lb/v0/load_balancer.pb.h )
  s.files += %w( src/core/lib/security/auth_filters.h )
  s.files += %w( src/core/lib/security/b64.h )
  s.files += %w( src/core/lib/security/credentials.h )
@ -298,6 +296,10 @@ Gem::Specification.new do |s|
  s.files += %w( third_party/nanopb/pb_common.h )
  s.files += %w( third_party/nanopb/pb_decode.h )
  s.files += %w( third_party/nanopb/pb_encode.h )
+  s.files += %w( src/core/ext/lb_policy/grpclb/load_balancer_api.c )
+  s.files += %w( src/core/ext/lb_policy/grpclb/proto/grpc/lb/v0/load_balancer.pb.c )
+  s.files += %w( src/core/ext/lb_policy/pick_first/pick_first.c )
+  s.files += %w( src/core/ext/lb_policy/round_robin/round_robin.c )
  s.files += %w( src/core/ext/transport/chttp2/client/insecure/channel_create.c )
  s.files += %w( src/core/ext/transport/chttp2/client/secure/secure_channel_create.c )
  s.files += %w( src/core/ext/transport/chttp2/server/insecure/server_chttp2.c )
@ -345,9 +347,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/client_config/connector.c )
  s.files += %w( src/core/lib/client_config/default_initial_connect_string.c )
  s.files += %w( src/core/lib/client_config/initial_connect_string.c )
-  s.files += %w( src/core/lib/client_config/lb_policies/load_balancer_api.c )
-  s.files += %w( src/core/lib/client_config/lb_policies/pick_first.c )
-  s.files += %w( src/core/lib/client_config/lb_policies/round_robin.c )
  s.files += %w( src/core/lib/client_config/lb_policy.c )
  s.files += %w( src/core/lib/client_config/lb_policy_factory.c )
  s.files += %w( src/core/lib/client_config/lb_policy_registry.c )
@ -413,7 +412,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/json/json_reader.c )
  s.files += %w( src/core/lib/json/json_string.c )
  s.files += %w( src/core/lib/json/json_writer.c )
-  s.files += %w( src/core/lib/proto/grpc/lb/v0/load_balancer.pb.c )
  s.files += %w( src/core/lib/security/b64.c )
  s.files += %w( src/core/lib/security/client_auth_filter.c )
  s.files += %w( src/core/lib/security/credentials.c )
@ -459,6 +457,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/lib/tsi/fake_transport_security.c )
  s.files += %w( src/core/lib/tsi/ssl_transport_security.c )
  s.files += %w( src/core/lib/tsi/transport_security.c )
+  s.files += %w( src/core/plugin_registry/grpc_plugin_registry.c )
  s.files += %w( third_party/nanopb/pb_common.c )
  s.files += %w( third_party/nanopb/pb_decode.c )
  s.files += %w( third_party/nanopb/pb_encode.c )
--- a/include/grpc++/alarm.h
+++ b/include/grpc++/alarm.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/channel.h
+++ b/include/grpc++/channel.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/client_context.h
+++ b/include/grpc++/client_context.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/completion_queue.h
+++ b/include/grpc++/completion_queue.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/create_channel.h
+++ b/include/grpc++/create_channel.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/generic/async_generic_service.h
+++ b/include/grpc++/generic/async_generic_service.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/generic/generic_stub.h
+++ b/include/grpc++/generic/generic_stub.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/call.h
+++ b/include/grpc++/impl/call.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/client_unary_call.h
+++ b/include/grpc++/impl/client_unary_call.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/async_stream.h
+++ b/include/grpc++/impl/codegen/async_stream.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/async_unary_call.h
+++ b/include/grpc++/impl/codegen/async_unary_call.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/call.h
+++ b/include/grpc++/impl/codegen/call.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/call_hook.h
+++ b/include/grpc++/impl/codegen/call_hook.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/client_context.h
+++ b/include/grpc++/impl/codegen/client_context.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/client_unary_call.h
+++ b/include/grpc++/impl/codegen/client_unary_call.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/completion_queue.h
+++ b/include/grpc++/impl/codegen/completion_queue.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/completion_queue_tag.h
+++ b/include/grpc++/impl/codegen/completion_queue_tag.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/config_protobuf.h
+++ b/include/grpc++/impl/codegen/config_protobuf.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/core_codegen_interface.h
+++ b/include/grpc++/impl/codegen/core_codegen_interface.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/impl/async_stream.h
+++ b/include/grpc++/impl/codegen/impl/async_stream.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/impl/sync.h
+++ b/include/grpc++/impl/codegen/impl/sync.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/method_handler_impl.h
+++ b/include/grpc++/impl/codegen/method_handler_impl.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/proto_utils.h
+++ b/include/grpc++/impl/codegen/proto_utils.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/rpc_method.h
+++ b/include/grpc++/impl/codegen/rpc_method.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/security/auth_context.h
+++ b/include/grpc++/impl/codegen/security/auth_context.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/serialization_traits.h
+++ b/include/grpc++/impl/codegen/serialization_traits.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/server_context.h
+++ b/include/grpc++/impl/codegen/server_context.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/server_interface.h
+++ b/include/grpc++/impl/codegen/server_interface.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/service_type.h
+++ b/include/grpc++/impl/codegen/service_type.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/string_ref.h
+++ b/include/grpc++/impl/codegen/string_ref.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/stub_options.h
+++ b/include/grpc++/impl/codegen/stub_options.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/sync.h
+++ b/include/grpc++/impl/codegen/sync.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/sync_cxx11.h
+++ b/include/grpc++/impl/codegen/sync_cxx11.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/sync_no_cxx11.h
+++ b/include/grpc++/impl/codegen/sync_no_cxx11.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/sync_stream.h
+++ b/include/grpc++/impl/codegen/sync_stream.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/codegen/time.h
+++ b/include/grpc++/impl/codegen/time.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/grpc_library.h
+++ b/include/grpc++/impl/grpc_library.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/method_handler_impl.h
+++ b/include/grpc++/impl/method_handler_impl.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/proto_utils.h
+++ b/include/grpc++/impl/proto_utils.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/rpc_method.h
+++ b/include/grpc++/impl/rpc_method.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/serialization_traits.h
+++ b/include/grpc++/impl/serialization_traits.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/service_type.h
+++ b/include/grpc++/impl/service_type.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/sync.h
+++ b/include/grpc++/impl/sync.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/sync_cxx11.h
+++ b/include/grpc++/impl/sync_cxx11.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/impl/sync_no_cxx11.h
+++ b/include/grpc++/impl/sync_no_cxx11.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/security/auth_context.h
+++ b/include/grpc++/security/auth_context.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/security/auth_metadata_processor.h
+++ b/include/grpc++/security/auth_metadata_processor.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/security/credentials.h
+++ b/include/grpc++/security/credentials.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/security/server_credentials.h
+++ b/include/grpc++/security/server_credentials.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/server.h
+++ b/include/grpc++/server.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/server_builder.h
+++ b/include/grpc++/server_builder.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/server_context.h
+++ b/include/grpc++/server_context.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/support/async_stream.h
+++ b/include/grpc++/support/async_stream.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/support/async_unary_call.h
+++ b/include/grpc++/support/async_unary_call.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/support/byte_buffer.h
+++ b/include/grpc++/support/byte_buffer.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/support/channel_arguments.h
+++ b/include/grpc++/support/channel_arguments.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/support/config.h
+++ b/include/grpc++/support/config.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/support/config_protobuf.h
+++ b/include/grpc++/support/config_protobuf.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/support/slice.h
+++ b/include/grpc++/support/slice.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/support/status.h
+++ b/include/grpc++/support/status.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/support/status_code_enum.h
+++ b/include/grpc++/support/status_code_enum.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/support/string_ref.h
+++ b/include/grpc++/support/string_ref.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/support/stub_options.h
+++ b/include/grpc++/support/stub_options.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/support/sync_stream.h
+++ b/include/grpc++/support/sync_stream.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc++/support/time.h
+++ b/include/grpc++/support/time.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc/byte_buffer.h
+++ b/include/grpc/byte_buffer.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc/byte_buffer_reader.h
+++ b/include/grpc/byte_buffer_reader.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc/census.h
+++ b/include/grpc/census.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc/compression.h
+++ b/include/grpc/compression.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc/grpc.h
+++ b/include/grpc/grpc.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc/grpc_security.h
+++ b/include/grpc/grpc_security.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/include/grpc/grpc_zookeeper.h
+++ b/include/grpc/grpc_zookeeper.h
@ -1,6 +1,6 @@
 /*
 *
- * Copyright 2015-2016, Google Inc.
+ * Copyright 2015, Google Inc.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/Show More
+++ b/Show More