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

38f167c4

Commit 38f167c4 authored 8 years ago by Ken Payson

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into fix_python_interop

parents 7e7ac1c6 305dcf3d

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

BUILD 0 additions, 12 deletions

BUILD
CMakeLists.txt 3 additions, 2 deletions

CMakeLists.txt
Makefile 0 additions, 2 deletions

Makefile
build.yaml 0 additions, 8 deletions

build.yaml
test/core/slice/slice_buffer_test.c 2 additions, 2 deletions

test/core/slice/slice_buffer_test.c
test/cpp/thread_manager/thread_manager_test.cc 1 addition, 1 deletion

test/cpp/thread_manager/thread_manager_test.cc
tools/run_tests/generated/sources_and_headers.json 1 addition, 20 deletions

tools/run_tests/generated/sources_and_headers.json
tools/run_tests/sanity/check_submodules.sh 0 additions, 1 deletion

tools/run_tests/sanity/check_submodules.sh
vsprojects/vcxproj/grpc++_test_util/grpc++_test_util.vcxproj 0 additions, 2 deletions

vsprojects/vcxproj/grpc++_test_util/grpc++_test_util.vcxproj
vsprojects/vcxproj/grpc++_test_util/grpc++_test_util.vcxproj.filters 0 additions, 6 deletions

...vcxproj/grpc++_test_util/grpc++_test_util.vcxproj.filters

with 7 additions and 56 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