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

a47f51ff

Commit a47f51ff authored 8 years ago by Craig Tiller

Downloads
- Plain Diff

Merge github.com:grpc/grpc into metadata_filter

parents 9277aa74 3d11a912

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Makefile 33 additions, 27 deletions

Makefile
include/grpc/impl/codegen/port_platform.h 1 addition, 1 deletion

include/grpc/impl/codegen/port_platform.h
src/core/lib/iomgr/iocp_windows.c 0 additions, 1 deletion

src/core/lib/iomgr/iocp_windows.c
src/core/lib/iomgr/tcp_server_windows.c 4 additions, 6 deletions

src/core/lib/iomgr/tcp_server_windows.c
src/ruby/pb/test/client.rb 1 addition, 1 deletion

src/ruby/pb/test/client.rb
templates/Makefile.template 12 additions, 6 deletions

templates/Makefile.template
tools/run_tests/run_interop_tests.py 2 additions, 2 deletions

tools/run_tests/run_interop_tests.py

with 53 additions and 44 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