Merge branch 'release-0_15' into upmerge-master

Browse Source

Conflicts:
	Makefile
	build.yaml
	gRPC-Core.podspec
	gRPC.podspec
	package.json
	package.xml
	src/core/lib/surface/version.c
	src/csharp/Grpc.Auth/project.json
	src/csharp/Grpc.Core/VersionInfo.cs
	src/csharp/Grpc.Core/project.json
	src/csharp/Grpc.HealthCheck/project.json
	src/csharp/build_packages.bat
	src/node/tools/package.json
	src/python/grpcio/grpc/__init__.py
	src/python/grpcio/grpc_version.py
	src/python/grpcio_tests/tests/unit/_rpc_test.py
	src/ruby/lib/grpc/version.rb
	src/ruby/tools/version.rb
	templates/gRPC.podspec.template
	tools/distrib/python/grpcio_tools/grpc_version.py
	tools/doxygen/Doxyfile.c++
	tools/doxygen/Doxyfile.c++.internal
	tools/doxygen/Doxyfile.core
	tools/doxygen/Doxyfile.core.internal
	tools/run_tests/port_server.py

...

This commit is contained in:

Nicolas "Pixel" Noble 2016-07-12 04:30:57 +02:00

parent 25ddf0425e b161c4a8c5

commit 675c458894

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available