Skip to content
Snippets Groups Projects
Commit c6a06060 authored by Nathaniel Manista's avatar Nathaniel Manista
Browse files

v1.0.x → master upmerge

Manual resolution:

- New test added in src/python/grpcio_test/tests/tests.json

- Timeout-related edits resolved in tools/run_tests/run_tests.py

Manual changes:

- Pass request iterator rather than request sequence in
  _reflection_servicer_test.py
parents 08e10551 59e0d60b
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment