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 /tools/run_tests/sources_and_headers.json | |
| 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 'tools/run_tests/sources_and_headers.json')
| -rw-r--r-- | tools/run_tests/sources_and_headers.json | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json index 1fbf2e0778..d2cf07f197 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -10926,7 +10926,6 @@ "include/grpc/grpc_security.h", "include/grpc/status.h", "src/core/census/context.h", - "src/core/census/grpc_context.h", "src/core/census/rpc_stat_id.h", "src/core/channel/census_filter.h", "src/core/channel/channel_args.h", @@ -11056,7 +11055,6 @@ "src/core/census/context.c", "src/core/census/context.h", "src/core/census/grpc_context.c", - "src/core/census/grpc_context.h", "src/core/census/initialize.c", "src/core/census/record_stat.c", "src/core/census/rpc_stat_id.h", @@ -11398,7 +11396,6 @@ "include/grpc/grpc.h", "include/grpc/status.h", "src/core/census/context.h", - "src/core/census/grpc_context.h", "src/core/census/rpc_stat_id.h", "src/core/channel/census_filter.h", "src/core/channel/channel_args.h", @@ -11510,7 +11507,6 @@ "src/core/census/context.c", "src/core/census/context.h", "src/core/census/grpc_context.c", - "src/core/census/grpc_context.h", "src/core/census/initialize.c", "src/core/census/record_stat.c", "src/core/census/rpc_stat_id.h", |