grpc - RPC system from Google

	Commit message (Collapse)	Author	Age
*	Revert bad changes to grpc.podspec	Craig Tiller	2016-08-04
\|
*	Merge github.com:grpc/grpc into grand-unified-closures	Craig Tiller	2016-08-04
\|\
\| *	Commit as 1.0.0-pre1 so we can release already.	Jorge Canizales	2016-07-18
\| \|
\| *	We’re done with the underscore tags for good!	Jorge Canizales	2016-07-18
\| \| \| \| \| \|	Yay compatibility and predictability!
\| *	Advance versions from 0.14 -> 1.0	Jorge Canizales	2016-07-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pending: - Tag BoringSSL repo. - Tag gRPC repo. - Build the plugin, zip it, and add it to the release. - Push Cocoapods to trunk.
* \|	Merge branch 'delayed-write' into grand-unified-closures	Craig Tiller	2016-07-13
\|\\|
\| *	gRPC.podspec shouldn't be a template anymore.	Nicolas "Pixel" Noble	2016-07-12
\| \|
* \|	Merge branch 'delayed-write' into grand-unified-closures	Craig Tiller	2016-07-12
\|\ \
\| * \|	Merge branch 'release-0_15' into upmerge-master	Nicolas "Pixel" Noble	2016-07-12
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \|	Merge github.com:grpc/grpc into grand-unified-closures	Craig Tiller	2016-07-08
\|\\| \|
* \| \|	Rename async_execution_lock --> combiner, make it use closures, unroll ↵	Craig Tiller	2016-07-07
\| \| \| \| \| \| \| \| \| \| \| \|	previous changes for idleness
* \| \|	Merge github.com:grpc/grpc into atm2	Craig Tiller	2016-07-07
\|\ \ \
\| \| * \|	Merge fixup: version, deployment target & spec name	Jorge Canizales	2016-07-01
\| \| \| \|
\| \| * \|	Merge master into merge-0.14-into-master	Jorge Canizales	2016-06-30
\| \| \|\ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: - gRPC.podspec - Only had non-trivial changes in the core file list, which will need to be regenerated (in gRPC-Core.podspec). - src/objective-c/BoringSSL.podspec - Had trivial conflicts in the version. - src/objective-c/examples/RemoteTestClient/RemoteTest.podspec - Trivial conflicts in quoting. - src/objective-c/examples/Sample/Sample.xcodeproj/project.pbxproj and src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj - The master version is used, pending testing. The 0.14 version had emoji and some unneeded entries. - src/objective-c/tests/Podfile - Added CronetFramework pod, and warning silencing from master. - templates/gRPC.podspec.template - Deleted. - third_party/protobuf - Using master commit, but need to verify if it works for frameworks.
\| * \| \|	Resolved merge conflicts with master	murgatroid99	2016-06-27
\| \|\ \ \
\| \| * \ \	Merge pull request #6973 from makdharma/network_status_change	Jan Tattermusch	2016-06-27
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Network status tracking
\| \| * \ \ \	Merge branch 'master' into epoll_changes_merged	Sree Kuchibhotla	2016-06-21
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| \| \| * \|	more files after running build.yaml changes through	Makarand Dharmapurikar	2016-06-20
\| \| \| \|/ /
\| * \| \| \|	Resolved merge conflicts with master	murgatroid99	2016-06-20
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| \| * \|	Merge branch 'master' into epoll_changes	Sree Kuchibhotla	2016-06-16
\| \| \| \|\ \
\| * \| \| \| \|	Allow disabling traces, add trace variables for pluck and timeout events	murgatroid99	2016-06-15
\| \| \|_\|/ / \| \|/\| \| \|
\| \| * \| \|	Merge branch 'idempotent_endpoint_shutdown' into handshake_timeout	Craig Tiller	2016-06-15
\| \| \|\ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge remote-tracking branch 'upstream/master' into base64_decode	Yuchen Zeng	2016-06-09
\| \|\ \ \ \
\| \| \| \| * \	Merge branch 'master' into epoll_changes	Sree Kuchibhotla	2016-06-09
\| \| \| \| \|\ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| \| * \| \|	Merge github.com:grpc/grpc into error	Craig Tiller	2016-06-09
\| \| \| \|\ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| \| \| \| *	Separate Core, ProtoRuntime, and RxLibrary subspecs	Jorge Canizales	2016-06-08
\| \| \| \| \| \|
\| \| * \| \| \|	Merge pull request #6481 from dgquintas/compression_md_level_bis	Jan Tattermusch	2016-06-08
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow servers to select compression level via initial MD & overall compression cleanup
\| * \| \ \ \ \	Merge remote-tracking branch 'upstream/master' into base64_decode	Yuchen Zeng	2016-06-08
\| \|\ \ \ \ \ \
\| \| \| \| \| \| * \	Merge branch 'master' into epoll_changes	Sree Kuchibhotla	2016-06-08
\| \| \| \| \| \| \|\ \ \| \| \| \|_\|_\|_\|/ / \| \| \|/\| \| \| \| \|
\| \| \| \| * \| \| \|	Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis	David Garcia Quintas	2016-06-07
\| \| \| \| \|\ \ \ \ \| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \|
\| \| \| * \| \| \| \|	implement support for adding external fd to server	Adam Michalik	2016-06-07
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	separate posix functionality to grpc_posix.h	Adam Michalik	2016-06-07
\| \| \|/ / / / /
\| \| \| \| * \| \|	Merge github.com:grpc/grpc into error	Craig Tiller	2016-06-07
\| \| \| \| \|\ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| \| \| \| * \| \|	Merge github.com:grpc/grpc into error	Craig Tiller	2016-06-07
\| \| \| \| \|\ \ \
\| \| * \| \| \ \ \	Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation	David Garcia Quintas	2016-06-06
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|/ / / \| \| \| \|/\| \| \| \|
\| \| \| * \| \| \| \|	Merge pull request #6750 from makdharma/cronet	Jan Tattermusch	2016-06-06
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cronet build related changes to build.yaml, and added ifdef guard around objective_c cronet code.
\| \| \| \| \| \| \| * \	Merge branch 'master' into epoll_changes	Sree Kuchibhotla	2016-06-06
\| \| \| \| \| \| \| \|\ \ \| \| \| \| \|_\|_\|_\|/ / \| \| \| \|/\| \| \| \| \|
\| \| \| \| \| \| \| * \|	Remove unused files	Sree Kuchibhotla	2016-06-06
\| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \|	Merge github.com:grpc/grpc into error	Craig Tiller	2016-06-06
\| \| \| \| \| \| \|\ \ \ \| \| \| \| \|_\|_\|/ / / \| \| \| \|/\| \| \| \| \|
\| \| \| \| \| * \| \| \|	Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis	David Garcia Quintas	2016-06-03
\| \| \| \| \| \|\ \ \ \ \| \| \| \| \|_\|/ / / / \| \| \| \|/\| \| \| \| \|
\| \| \| * \| \| \| \| \|	Merge pull request #6306 from y-zeng/win32_suffix	Jan Tattermusch	2016-06-03
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change win32 file suffix
\| \| \| * \ \ \ \ \ \	Merge branch 'master' of github.com:grpc/grpc into lr_hook	David Garcia Quintas	2016-06-02
\| \| \| \|\ \ \ \ \ \ \
\| \| \| \| \| \| * \| \| \| \|	incremental fix - removed cronet dependency from grpc_secure	Makarand Dharmapurikar	2016-06-01
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \|	cronet build related changes	Makarand Dharmapurikar	2016-06-01
\| \| \| \| \| \|/ / / / / \| \| \| \| \|/\| \| \| \| \|
\| \| \| \| \| \| \| * \| \|	Merge github.com:grpc/grpc into error	Craig Tiller	2016-06-01
\| \| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \|_\|_\|/ / / \| \| \| \| \|/\| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Merge pull request #6702 from a-veitch/add_proto	Jan Tattermusch	2016-06-01
\| \| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add census protos.
\| \| \| \| \| \| \| \| * \ \	Merge github.com:grpc/grpc into error	Craig Tiller	2016-06-01
\| \| \| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \|_\|_\|_\|/ / / \| \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	s/grpc_pops/grpc_polling_entity	David Garcia Quintas	2016-05-31
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \|	Merge remote-tracking branch 'upstream/master' into base	Yuchen Zeng	2016-05-31
\| \| \| \| \| \| \|\ \ \ \ \
\| \| * \| \| \| \| \ \ \ \ \	Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation	David Garcia Quintas	2016-05-31
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ / / / / \| \| \| \|/\| \| \| \| \| \| \| \|