-
- Downloads
Merge remote-tracking branch 'google/release-0_13' into upmerge-from-0.13
Conflicts: Makefile build.yaml package.json setup.py src/core/surface/version.c src/csharp/Grpc.Core/VersionInfo.cs src/csharp/build_packages.bat src/python/grpcio/grpc_version.py src/ruby/lib/grpc/version.rb tools/doxygen/Doxyfile.c++ tools/doxygen/Doxyfile.c++.internal tools/doxygen/Doxyfile.core tools/doxygen/Doxyfile.core.internal
No related branches found
No related tags found
Showing
- PYTHON-MANIFEST.in 1 addition, 0 deletionsPYTHON-MANIFEST.in
- package.json 1 addition, 2 deletionspackage.json
- requirements.txt 1 addition, 0 deletionsrequirements.txt
- setup.py 25 additions, 18 deletionssetup.py
- src/python/grpcio/README.rst 28 additions, 10 deletionssrc/python/grpcio/README.rst
- src/python/grpcio/commands.py 19 additions, 114 deletionssrc/python/grpcio/commands.py
- src/python/grpcio/precompiled.py 102 additions, 0 deletionssrc/python/grpcio/precompiled.py
- templates/package.json.template 1 addition, 2 deletionstemplates/package.json.template
- test/distrib/node/run_distrib_test.sh 3 additions, 0 deletionstest/distrib/node/run_distrib_test.sh
- tools/dockerfile/distribtest/python_fedora21_x64/Dockerfile 5 additions, 0 deletionstools/dockerfile/distribtest/python_fedora21_x64/Dockerfile
- tools/dockerfile/distribtest/ruby_fedora21_x64/Dockerfile 5 additions, 0 deletionstools/dockerfile/distribtest/ruby_fedora21_x64/Dockerfile
- tools/run_tests/build_artifact_node.sh 2 additions, 2 deletionstools/run_tests/build_artifact_node.sh
- tools/run_tests/build_artifact_python.sh 10 additions, 2 deletionstools/run_tests/build_artifact_python.sh
- tools/run_tests/build_package_node.sh 1 addition, 0 deletionstools/run_tests/build_package_node.sh
- tools/run_tests/distribtest_targets.py 5 additions, 5 deletionstools/run_tests/distribtest_targets.py
Loading
Please register or sign in to comment