diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2015-08-13 10:31:05 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2015-08-13 10:31:05 -0700 |
| commit | 46e85b02cda4ad4d549e444b78d1e74a3021a9d9 (patch) | |
| tree | 51bccc374623625a19a5fb53df60bc08c2c7713e /tools/run_tests/sources_and_headers.json | |
| parent | 58d637444187f36181d3662e85e42aa1d23af92a (diff) | |
| parent | 58d7310fbc291d2afa9cbb100544fc5c96cd3249 (diff) | |
Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3
Conflicts:
src/csharp/Grpc.Core/VersionInfo.cs
src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs
src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
src/csharp/Grpc.IntegrationTesting/InteropClient.cs
src/csharp/Grpc.IntegrationTesting/packages.config
src/csharp/build_packages.bat
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 5d23bf9e88..d2c3ec3add 100644 --- a/tools/run_tests/sources_and_headers.json +++ b/tools/run_tests/sources_and_headers.json @@ -13051,7 +13051,6 @@ "include/grpc++/async_generic_service.h", "include/grpc++/async_unary_call.h", "include/grpc++/auth_context.h", - "include/grpc++/auth_property_iterator.h", "include/grpc++/byte_buffer.h", "include/grpc++/channel_arguments.h", "include/grpc++/channel_interface.h", @@ -13102,7 +13101,6 @@ "include/grpc++/async_generic_service.h", "include/grpc++/async_unary_call.h", "include/grpc++/auth_context.h", - "include/grpc++/auth_property_iterator.h", "include/grpc++/byte_buffer.h", "include/grpc++/channel_arguments.h", "include/grpc++/channel_interface.h", @@ -13227,7 +13225,6 @@ "include/grpc++/async_generic_service.h", "include/grpc++/async_unary_call.h", "include/grpc++/auth_context.h", - "include/grpc++/auth_property_iterator.h", "include/grpc++/byte_buffer.h", "include/grpc++/channel_arguments.h", "include/grpc++/channel_interface.h", @@ -13275,7 +13272,6 @@ "include/grpc++/async_generic_service.h", "include/grpc++/async_unary_call.h", "include/grpc++/auth_context.h", - "include/grpc++/auth_property_iterator.h", "include/grpc++/byte_buffer.h", "include/grpc++/channel_arguments.h", "include/grpc++/channel_interface.h", |