Merge pull request #11516 from murgatroid99/upmerge_1.4.x
Upmerge 1.4.x into Master
No related branches found
No related tags found
Showing
- BUILD 2 additions, 2 deletionsBUILD
- binding.gyp 9 additions, 11 deletionsbinding.gyp
- config.w32 130 additions, 0 deletionsconfig.w32
- package.json 1 addition, 1 deletionpackage.json
- src/csharp/Grpc.Core.Tests/ServerTest.cs 16 additions, 0 deletionssrc/csharp/Grpc.Core.Tests/ServerTest.cs
- src/csharp/Grpc.Core/Server.cs 20 additions, 1 deletionsrc/csharp/Grpc.Core/Server.cs
- src/csharp/ext/grpc_csharp_ext.c 11 additions, 3 deletionssrc/csharp/ext/grpc_csharp_ext.c
- src/node/src/grpc_extension.js 7 additions, 0 deletionssrc/node/src/grpc_extension.js
- src/node/test/surface_test.js 47 additions, 0 deletionssrc/node/test/surface_test.js
- src/php/ext/grpc/version.h 1 addition, 1 deletionsrc/php/ext/grpc/version.h
- templates/binding.gyp.template 9 additions, 11 deletionstemplates/binding.gyp.template
- templates/config.w32.template 36 additions, 0 deletionstemplates/config.w32.template
- templates/package.json.template 1 addition, 1 deletiontemplates/package.json.template
- templates/src/php/ext/grpc/version.h.template 1 addition, 1 deletiontemplates/src/php/ext/grpc/version.h.template
- test/distrib/node/run_distrib_test.sh 2 additions, 2 deletionstest/distrib/node/run_distrib_test.sh
- tools/run_tests/artifacts/build_artifact_node.bat 3 additions, 3 deletionstools/run_tests/artifacts/build_artifact_node.bat
- tools/run_tests/artifacts/build_artifact_node.sh 3 additions, 3 deletionstools/run_tests/artifacts/build_artifact_node.sh
- tools/run_tests/helper_scripts/pre_build_node.bat 4 additions, 2 deletionstools/run_tests/helper_scripts/pre_build_node.bat
- tools/run_tests/helper_scripts/pre_build_node.sh 4 additions, 2 deletionstools/run_tests/helper_scripts/pre_build_node.sh
- tools/run_tests/run_tests.py 4 additions, 3 deletionstools/run_tests/run_tests.py
Loading
Please register or sign in to comment