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

38c6cfb8

Commit 38c6cfb8 authored 8 years ago by Nicolas Noble

Downloads
- Plain Diff

Merge pull request #6536 from grpc/release-0_14

Release 0.14 upmerge

parents 13435ed9 331f05cb

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

package.json 2 additions, 0 deletions

package.json
src/node/tools/bin/protoc.js 4 additions, 3 deletions

src/node/tools/bin/protoc.js
src/node/tools/bin/protoc_plugin.js 5 additions, 3 deletions

src/node/tools/bin/protoc_plugin.js
src/ruby/tools/grpc-tools.gemspec 1 addition, 1 deletion

src/ruby/tools/grpc-tools.gemspec
templates/package.json.template 2 additions, 0 deletions

templates/package.json.template
third_party/protobuf 1 addition, 1 deletion

third_party/protobuf
tools/distrib/python/grpcio_tools/protoc_lib_deps.py 1 addition, 1 deletion

tools/distrib/python/grpcio_tools/protoc_lib_deps.py
tools/run_tests/build_package_node.sh 1 addition, 1 deletion

tools/run_tests/build_package_node.sh
tools/run_tests/sanity/check_submodules.sh 1 addition, 1 deletion

tools/run_tests/sanity/check_submodules.sh

with 18 additions and 11 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