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

a41fd5b0

Commit a41fd5b0 authored 8 years ago by murgatroid99

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_1.2.4

parents 4d0ee2a5 e48dd230

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

BUILD 4 additions, 3 deletions

BUILD
Makefile 6 additions, 6 deletions

Makefile
build.yaml 1 addition, 1 deletion

build.yaml
src/node/ext/call.cc 36 additions, 20 deletions

src/node/ext/call.cc
src/node/ext/call.h 2 additions, 5 deletions

src/node/ext/call.h
src/node/ext/completion_queue_threadpool.cc 2 additions, 7 deletions

src/node/ext/completion_queue_threadpool.cc
src/node/ext/completion_queue_uv.cc 4 additions, 8 deletions

src/node/ext/completion_queue_uv.cc
src/node/ext/server.cc 45 additions, 0 deletions

src/node/ext/server.cc
src/node/ext/server.h 2 additions, 0 deletions

src/node/ext/server.h
src/node/ext/server_uv.cc 7 additions, 8 deletions

src/node/ext/server_uv.cc
src/node/test/test_messages.proto 1 addition, 1 deletion

src/node/test/test_messages.proto
templates/Makefile.template 1 addition, 1 deletion

templates/Makefile.template

with 111 additions and 60 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