diff options
| author |  Nathaniel Manista <nathaniel@google.com> | 2017-01-06 00:37:31 +0000 |
|---|---|---|
| committer | Nathaniel Manista <nathaniel@google.com> | 2017-01-06 16:06:26 +0000 |
| commit | c6a06060809cfe0ee1be7ebc6e3a457903eb173b (patch) | |
| tree | 2f050e57bfa4a7da8a80b5706a30df7c69724123 /.istanbul.yml | |
| parent | 08e105517577fc25d7de93453bcf359cb9b48c98 (diff) | |
| parent | 59e0d60b6b312d701d6731ebdf894e6c5d1ef202 (diff) | |
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
Diffstat (limited to '.istanbul.yml')
0 files changed, 0 insertions, 0 deletions