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

f1a23b0f

Commit f1a23b0f authored 8 years ago by jiangtaoli2016

Downloads
- Plain Diff

Merge branch 'master' of https://github.com/grpc/grpc into new_tsi

parents d5a24147 921b8968

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 2 additions, 5 deletions

CMakeLists.txt
Makefile 2 additions, 2 deletions

Makefile
memory_usage.csv 0 additions, 1 deletion

memory_usage.csv
src/proto/grpc/testing/BUILD 5 additions, 1 deletion

src/proto/grpc/testing/BUILD
src/proto/grpc/testing/services.proto 6 additions, 0 deletions

src/proto/grpc/testing/services.proto
templates/CMakeLists.txt.template 2 additions, 5 deletions

templates/CMakeLists.txt.template
test/cpp/microbenchmarks/bm_cq_multiple_threads.cc 32 additions, 14 deletions

test/cpp/microbenchmarks/bm_cq_multiple_threads.cc
test/cpp/qps/benchmark_config.cc 15 additions, 0 deletions

test/cpp/qps/benchmark_config.cc
test/cpp/qps/report.cc 35 additions, 0 deletions

test/cpp/qps/report.cc
test/cpp/qps/report.h 18 additions, 0 deletions

test/cpp/qps/report.h

with 117 additions and 28 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