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

41a19c6c

Commit 41a19c6c authored 10 years ago by Tim Emiola

Downloads
- Plain Diff

Merge branch 'master' into grpc_tools_docker_pregenerate_ssh_key

parents b954c98d 52d43890

No related branches found

No related tags found

No related merge requests found

Changes 15

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 6 additions, 0 deletions

.gitignore
Makefile 625 additions, 13 deletions

Makefile
build.json 7 additions, 8 deletions

build.json
src/compiler/go_generator.cc 2 additions, 2 deletions

src/compiler/go_generator.cc
src/compiler/go_generator.h 1 addition, 1 deletion

src/compiler/go_generator.h
src/core/iomgr/pollset.h 1 addition, 0 deletions

src/core/iomgr/pollset.h
templates/Makefile.template 23 additions, 1 deletion

templates/Makefile.template
test/core/util/port.h 8 additions, 0 deletions

test/core/util/port.h
test/cpp/client/channel_arguments_test.cc 3 additions, 9 deletions

test/cpp/client/channel_arguments_test.cc
test/cpp/client/credentials_test.cc 1 addition, 1 deletion

test/cpp/client/credentials_test.cc
test/cpp/end2end/end2end_test.cc 4 additions, 4 deletions

test/cpp/end2end/end2end_test.cc
test/cpp/end2end/sync_client_async_server_test.cc 2 additions, 2 deletions

test/cpp/end2end/sync_client_async_server_test.cc
test/cpp/qps/qpstest.proto 0 additions, 4 deletions

test/cpp/qps/qpstest.proto
tools/run_tests/jobset.py 38 additions, 12 deletions

tools/run_tests/jobset.py
tools/run_tests/run_tests.py 50 additions, 17 deletions

tools/run_tests/run_tests.py

with 771 additions and 74 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