Skip to content
Snippets Groups Projects
  • Nathaniel Manista's avatar
    c6a06060
    v1.0.x → master upmerge · c6a06060
    Nathaniel Manista authored
    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
    c6a06060
    History
    v1.0.x → master upmerge
    Nathaniel Manista authored
    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