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

046d92dc

Commit 046d92dc authored 10 years ago by Vijay Pai

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master'

parents 8c8588c7 10bb15cd

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Makefile 46 additions, 1 deletion

Makefile
build.json 15 additions, 0 deletions

build.json
include/grpc++/completion_queue.h 4 additions, 3 deletions

include/grpc++/completion_queue.h
src/cpp/common/completion_queue.cc 10 additions, 7 deletions

src/cpp/common/completion_queue.cc
src/cpp/util/time.cc 5 additions, 1 deletion

src/cpp/util/time.cc
test/cpp/util/time_test.cc 14 additions, 1 deletion

test/cpp/util/time_test.cc
tools/run_tests/tests.json 5 additions, 0 deletions

tools/run_tests/tests.json

with 99 additions and 13 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