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

5bb44e93

Commit 5bb44e93 authored 8 years ago by Nicolas Noble Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #7584 from nicolasnoble/manual-upmerge

Manual upmerge from v1.0.x

parents f4f3cb39 8302b123

No related branches found

No related tags found

No related merge requests found

Changes 49

Hide whitespace changes

Inline Side-by-side

Showing

src/ruby/stress/metrics_server.rb 2 additions, 2 deletions

src/ruby/stress/metrics_server.rb
src/ruby/tools/bin/grpc_tools_ruby_protoc 12 additions, 5 deletions

src/ruby/tools/bin/grpc_tools_ruby_protoc
src/ruby/tools/bin/grpc_tools_ruby_protoc_plugin 0 additions, 0 deletions

src/ruby/tools/bin/grpc_tools_ruby_protoc_plugin
src/ruby/tools/grpc-tools.gemspec 1 addition, 1 deletion

src/ruby/tools/grpc-tools.gemspec
templates/src/csharp/Grpc.Core.Tests/project.json.template 4 additions, 1 deletion

templates/src/csharp/Grpc.Core.Tests/project.json.template
templates/src/node/health_check/package.json.template 2 additions, 2 deletions

templates/src/node/health_check/package.json.template
test/cpp/end2end/server_builder_plugin_test.cc 4 additions, 3 deletions

test/cpp/end2end/server_builder_plugin_test.cc
tools/run_tests/pre_build_csharp.bat 54 additions, 1 deletion

tools/run_tests/pre_build_csharp.bat
tools/run_tests/pre_build_csharp.sh 50 additions, 1 deletion

tools/run_tests/pre_build_csharp.sh

with 129 additions and 16 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