Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_v12x
Showing
- BUILD 8 additions, 8 deletionsBUILD
- cmake/msvc_static_runtime.cmake 2 additions, 0 deletionscmake/msvc_static_runtime.cmake
- grpc.gemspec 1 addition, 1 deletiongrpc.gemspec
- src/python/grpcio/grpc/_server.py 4 additions, 0 deletionssrc/python/grpcio/grpc/_server.py
- src/ruby/end2end/channel_closing_driver.rb 1 addition, 1 deletionsrc/ruby/end2end/channel_closing_driver.rb
- src/ruby/end2end/channel_state_driver.rb 1 addition, 1 deletionsrc/ruby/end2end/channel_state_driver.rb
- src/ruby/end2end/end2end_common.rb 3 additions, 2 deletionssrc/ruby/end2end/end2end_common.rb
- src/ruby/end2end/killed_client_thread_client.rb 58 additions, 0 deletionssrc/ruby/end2end/killed_client_thread_client.rb
- src/ruby/end2end/killed_client_thread_driver.rb 114 additions, 0 deletionssrc/ruby/end2end/killed_client_thread_driver.rb
- src/ruby/end2end/sig_handling_driver.rb 1 addition, 1 deletionsrc/ruby/end2end/sig_handling_driver.rb
- src/ruby/end2end/sig_int_during_channel_watch_driver.rb 1 addition, 1 deletionsrc/ruby/end2end/sig_int_during_channel_watch_driver.rb
- src/ruby/ext/grpc/rb_call.c 11 additions, 7 deletionssrc/ruby/ext/grpc/rb_call.c
- templates/grpc.gemspec.template 1 addition, 1 deletiontemplates/grpc.gemspec.template
- tools/run_tests/helper_scripts/pre_build_csharp.bat 1 addition, 1 deletiontools/run_tests/helper_scripts/pre_build_csharp.bat
- tools/run_tests/helper_scripts/run_ruby_end2end_tests.sh 1 addition, 0 deletionstools/run_tests/helper_scripts/run_ruby_end2end_tests.sh
Loading
Please register or sign in to comment