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

a1fc8fb9

Commit a1fc8fb9 authored 9 years ago by yang-g

Downloads
- Plain Diff

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

parents e2a4e990 757c157d

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

include/grpc/impl/codegen/compression_types.h 1 addition, 1 deletion

include/grpc/impl/codegen/compression_types.h
include/grpc/impl/codegen/propagation_bits.h 1 addition, 1 deletion

include/grpc/impl/codegen/propagation_bits.h
src/python/grpcio/commands.py 24 additions, 18 deletions

src/python/grpcio/commands.py
test/cpp/end2end/thread_stress_test.cc 2 additions, 2 deletions

test/cpp/end2end/thread_stress_test.cc
tools/dockerfile/distribtest/python_opensuse_x64/Dockerfile 7 additions, 0 deletions

tools/dockerfile/distribtest/python_opensuse_x64/Dockerfile

with 35 additions and 22 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