diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-07-31 07:45:59 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-31 07:45:59 -0700 |
| commit | 44a127c80ff6a9fca8da1aad79afc8a33a723b1d (patch) | |
| tree | ae2be5ce187baa10df0fbc9843ec9330d313c724 /BUILD | |
| parent | a7957f50af10954e2f266e979638ef13ac7c4460 (diff) | |
| parent | 909917955c99f6b32f34b4966c252daca0fe7061 (diff) | |
Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about
Conflicts:
vsprojects/Grpc.mak
vsprojects/grpc.sln
vsprojects/grpc/grpc.vcxproj
vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj
vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj
vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj
vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj
vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj
vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj
vsprojects/grpc_unsecure/grpc_unsecure.vcxproj
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -149,7 +149,6 @@ cc_library( "src/core/tsi/ssl_transport_security.h", "src/core/tsi/transport_security.h", "src/core/tsi/transport_security_interface.h", - "src/core/census/grpc_context.h", "src/core/channel/census_filter.h", "src/core/channel/channel_args.h", "src/core/channel/channel_stack.h", @@ -412,7 +411,6 @@ cc_library( cc_library( name = "grpc_unsecure", srcs = [ - "src/core/census/grpc_context.h", "src/core/channel/census_filter.h", "src/core/channel/channel_args.h", "src/core/channel/channel_stack.h", @@ -1140,7 +1138,6 @@ objc_library( "src/core/tsi/ssl_transport_security.h", "src/core/tsi/transport_security.h", "src/core/tsi/transport_security_interface.h", - "src/core/census/grpc_context.h", "src/core/channel/census_filter.h", "src/core/channel/channel_args.h", "src/core/channel/channel_stack.h", |