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

1d73b7bf

Commit 1d73b7bf authored 10 years ago by Craig Tiller

Downloads
- Plain Diff

Merge github.com:grpc/grpc into one-pass

Conflicts:
	include/grpc++/channel_interface.h

parents 4354a8eb c8667056

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

include/grpc++/channel_interface.h 3 additions, 4 deletions

include/grpc++/channel_interface.h
test/cpp/interop/client.cc 9 additions, 0 deletions

test/cpp/interop/client.cc
test/cpp/interop/interop_client.cc 44 additions, 0 deletions

test/cpp/interop/interop_client.cc
test/cpp/interop/interop_client.h 2 additions, 0 deletions

test/cpp/interop/interop_client.h

with 58 additions and 4 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