diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-05-24 15:58:14 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-05-24 15:58:14 -0700 |
| commit | 8b5276c02ec7aebdf749bfd95d140406e6ea2226 (patch) | |
| tree | 8389493193029a3cb5c80b11f595bc9d4d5035d7 /src/core/channel | |
| parent | 24d115654056aa2be3d548d80ea97937eb15b2a1 (diff) | |
| parent | 031dea1df4b6213b9f9779a824fccc6d348b8648 (diff) | |
Merge github.com:grpc/grpc into we-dont-need-no-backup
Conflicts:
src/core/surface/call.c
test/core/end2end/dualstack_socket_test.c
test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls.c
test/core/end2end/tests/early_server_shutdown_finishes_tags.c
test/core/end2end/tests/graceful_server_shutdown.c
test/core/end2end/tests/invoke_large_request.c
test/core/end2end/tests/max_concurrent_streams.c
test/core/end2end/tests/max_message_length.c
test/core/end2end/tests/request_response_with_binary_metadata_and_payload.c
test/core/end2end/tests/request_response_with_metadata_and_payload.c
test/core/end2end/tests/request_response_with_payload.c
test/core/end2end/tests/request_response_with_payload_and_call_creds.c
test/core/end2end/tests/request_response_with_trailing_metadata_and_payload.c
test/core/end2end/tests/request_with_large_metadata.c
test/core/end2end/tests/request_with_payload.c
test/core/httpcli/httpcli_test.c
tools/run_tests/run_tests.py
Diffstat (limited to 'src/core/channel')
0 files changed, 0 insertions, 0 deletions