diff options
| author |  Mark D. Roth <roth@google.com> | 2018-04-20 10:46:03 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2018-04-20 10:46:03 -0700 |
| commit | 2230d6094241b3a1c8b2da6abf4ed314ea1dacac (patch) | |
| tree | ab3e6d9b8f1bbaf835197f1880a379285397a89c /grpc.gyp | |
| parent | 542bceb573b4c52a883f95ff240c6aba473790bc (diff) | |
| parent | a1459aa6ce2a11f8d11a067cb6c86e6af84ffd71 (diff) | |
Merge remote-tracking branch 'upstream/master' into c++_subchannel_list
Diffstat (limited to 'grpc.gyp')
| -rw-r--r-- | grpc.gyp | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1650,7 +1650,9 @@ 'src/proto/grpc/testing/payloads.proto', 'src/proto/grpc/testing/stats.proto', 'src/proto/grpc/testing/control.proto', - 'src/proto/grpc/testing/services.proto', + 'src/proto/grpc/testing/benchmark_service.proto', + 'src/proto/grpc/testing/report_qps_scenario_service.proto', + 'src/proto/grpc/testing/worker_service.proto', 'test/cpp/qps/benchmark_config.cc', 'test/cpp/qps/client_async.cc', 'test/cpp/qps/client_sync.cc', @@ -2620,6 +2622,7 @@ 'test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc', 'test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc', 'test/core/end2end/tests/retry_non_retriable_status.cc', + 'test/core/end2end/tests/retry_non_retriable_status_before_recv_trailing_metadata_started.cc', 'test/core/end2end/tests/retry_recv_initial_metadata.cc', 'test/core/end2end/tests/retry_recv_message.cc', 'test/core/end2end/tests/retry_server_pushback_delay.cc', @@ -2709,6 +2712,7 @@ 'test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc', 'test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc', 'test/core/end2end/tests/retry_non_retriable_status.cc', + 'test/core/end2end/tests/retry_non_retriable_status_before_recv_trailing_metadata_started.cc', 'test/core/end2end/tests/retry_recv_initial_metadata.cc', 'test/core/end2end/tests/retry_recv_message.cc', 'test/core/end2end/tests/retry_server_pushback_delay.cc', |