Merge branch 'master' of github.com:grpc/grpc into the-purge-2

Conflicts:
	src/cpp/client/channel.cc
	vsprojects/vs2010/grpc++.vcxproj
	vsprojects/vs2013/grpc++.vcxproj.filters

1 files changed, 18 insertions, 9 deletions

diff --git a/BUILD b/BUILD
index 77e71b5878..e2860fb053 100644
--- a/BUILD
+++ b/BUILD
@@ -1,5 +1,7 @@
 # GRPC Bazel BUILD file.
 # This currently builds C and C++ code.
+# This file has been automatically generated from a template file.
+# Please look at the templates directory instead.
 
 # Copyright 2015, Google Inc.
 # All rights reserved.
@@ -104,6 +106,10 @@ cc_library(
     "include/grpc/support/sync_win32.h",
     "include/grpc/support/thd.h",
     "include/grpc/support/time.h",
+    "include/grpc/support/tls.h",
+    "include/grpc/support/tls_gcc.h",
+    "include/grpc/support/tls_msvc.h",
+    "include/grpc/support/tls_pthread.h",
     "include/grpc/support/useful.h",
   ],
   includes = [
@@ -120,7 +126,7 @@ cc_library(
   srcs = [
     "src/core/httpcli/format_request.h",
     "src/core/httpcli/httpcli.h",
-    "src/core/httpcli/httpcli_security_context.h",
+    "src/core/httpcli/httpcli_security_connector.h",
     "src/core/httpcli/parser.h",
     "src/core/security/auth.h",
     "src/core/security/base64.h",
@@ -128,7 +134,7 @@ cc_library(
     "src/core/security/json_token.h",
     "src/core/security/secure_endpoint.h",
     "src/core/security/secure_transport_setup.h",
-    "src/core/security/security_context.h",
+    "src/core/security/security_connector.h",
     "src/core/tsi/fake_transport_security.h",
     "src/core/tsi/ssl_transport_security.h",
     "src/core/tsi/transport_security.h",
@@ -143,7 +149,6 @@ cc_library(
     "src/core/channel/http_client_filter.h",
     "src/core/channel/http_filter.h",
     "src/core/channel/http_server_filter.h",
-    "src/core/channel/metadata_buffer.h",
     "src/core/channel/noop_filter.h",
     "src/core/compression/algorithm.h",
     "src/core/compression/message_compress.h",
@@ -182,6 +187,8 @@ cc_library(
     "src/core/json/json_common.h",
     "src/core/json/json_reader.h",
     "src/core/json/json_writer.h",
+    "src/core/profiling/timers.h",
+    "src/core/profiling/timers_preciseclock.h",
     "src/core/statistics/census_interface.h",
     "src/core/statistics/census_log.h",
     "src/core/statistics/census_rpc_stats.h",
@@ -222,19 +229,18 @@ cc_library(
     "src/core/transport/transport_impl.h",
     "src/core/httpcli/format_request.c",
     "src/core/httpcli/httpcli.c",
-    "src/core/httpcli/httpcli_security_context.c",
+    "src/core/httpcli/httpcli_security_connector.c",
     "src/core/httpcli/parser.c",
     "src/core/security/auth.c",
     "src/core/security/base64.c",
     "src/core/security/credentials.c",
     "src/core/security/credentials_posix.c",
     "src/core/security/credentials_win32.c",
-    "src/core/security/factories.c",
     "src/core/security/google_default_credentials.c",
     "src/core/security/json_token.c",
     "src/core/security/secure_endpoint.c",
     "src/core/security/secure_transport_setup.c",
-    "src/core/security/security_context.c",
+    "src/core/security/security_connector.c",
     "src/core/security/server_secure_chttp2.c",
     "src/core/surface/init_secure.c",
     "src/core/surface/secure_channel_create.c",
@@ -252,7 +258,6 @@ cc_library(
     "src/core/channel/http_client_filter.c",
     "src/core/channel/http_filter.c",
     "src/core/channel/http_server_filter.c",
-    "src/core/channel/metadata_buffer.c",
     "src/core/channel/noop_filter.c",
     "src/core/compression/algorithm.c",
     "src/core/compression/message_compress.c",
@@ -261,6 +266,7 @@ cc_library(
     "src/core/iomgr/alarm_heap.c",
     "src/core/iomgr/endpoint.c",
     "src/core/iomgr/endpoint_pair_posix.c",
+    "src/core/iomgr/endpoint_pair_windows.c",
     "src/core/iomgr/fd_posix.c",
     "src/core/iomgr/iocp_windows.c",
     "src/core/iomgr/iomgr.c",
@@ -293,6 +299,7 @@ cc_library(
     "src/core/json/json_reader.c",
     "src/core/json/json_string.c",
     "src/core/json/json_writer.c",
+    "src/core/profiling/timers.c",
     "src/core/statistics/census_init.c",
     "src/core/statistics/census_log.c",
     "src/core/statistics/census_rpc_stats.c",
@@ -370,7 +377,6 @@ cc_library(
     "src/core/channel/http_client_filter.h",
     "src/core/channel/http_filter.h",
     "src/core/channel/http_server_filter.h",
-    "src/core/channel/metadata_buffer.h",
     "src/core/channel/noop_filter.h",
     "src/core/compression/algorithm.h",
     "src/core/compression/message_compress.h",
@@ -409,6 +415,8 @@ cc_library(
     "src/core/json/json_common.h",
     "src/core/json/json_reader.h",
     "src/core/json/json_writer.h",
+    "src/core/profiling/timers.h",
+    "src/core/profiling/timers_preciseclock.h",
     "src/core/statistics/census_interface.h",
     "src/core/statistics/census_log.h",
     "src/core/statistics/census_rpc_stats.h",
@@ -459,7 +467,6 @@ cc_library(
     "src/core/channel/http_client_filter.c",
     "src/core/channel/http_filter.c",
     "src/core/channel/http_server_filter.c",
-    "src/core/channel/metadata_buffer.c",
     "src/core/channel/noop_filter.c",
     "src/core/compression/algorithm.c",
     "src/core/compression/message_compress.c",
@@ -468,6 +475,7 @@ cc_library(
     "src/core/iomgr/alarm_heap.c",
     "src/core/iomgr/endpoint.c",
     "src/core/iomgr/endpoint_pair_posix.c",
+    "src/core/iomgr/endpoint_pair_windows.c",
     "src/core/iomgr/fd_posix.c",
     "src/core/iomgr/iocp_windows.c",
     "src/core/iomgr/iomgr.c",
@@ -500,6 +508,7 @@ cc_library(
     "src/core/json/json_reader.c",
     "src/core/json/json_string.c",
     "src/core/json/json_writer.c",
+    "src/core/profiling/timers.c",
     "src/core/statistics/census_init.c",
     "src/core/statistics/census_log.c",
     "src/core/statistics/census_rpc_stats.c",