Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Grpc
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

353729a8

Commit 353729a8 authored 8 years ago by Jan Tattermusch

Downloads
- Plain Diff

Merge pull request #6014 from nicolasnoble/manual-upmerge

Manual upmerge from 0.13

parents 981bfb0f e33f9362

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/core/lib/iomgr/pollset_set_windows.c 1 addition, 1 deletion

src/core/lib/iomgr/pollset_set_windows.c
src/ruby/ext/grpc/rb_byte_buffer.c 6 additions, 9 deletions

src/ruby/ext/grpc/rb_byte_buffer.c
src/ruby/ext/grpc/rb_call.c 13 additions, 1 deletion

src/ruby/ext/grpc/rb_call.c
test/distrib/node/run_distrib_test.sh 14 additions, 8 deletions

test/distrib/node/run_distrib_test.sh
tools/run_tests/build_artifact_node.sh 1 addition, 1 deletion

tools/run_tests/build_artifact_node.sh
tools/run_tests/build_artifact_python.sh 6 additions, 7 deletions

tools/run_tests/build_artifact_python.sh
tools/run_tests/build_node.sh 1 addition, 1 deletion

tools/run_tests/build_node.sh
tools/run_tests/build_package_node.sh 1 addition, 1 deletion

tools/run_tests/build_package_node.sh
tools/run_tests/pre_build_node.sh 1 addition, 1 deletion

tools/run_tests/pre_build_node.sh
tools/run_tests/run_node.sh 1 addition, 1 deletion

tools/run_tests/run_node.sh

with 45 additions and 31 deletions

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 sign in to comment