Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #6279 from dgquintas/lb_proto_v1 | Jan Tattermusch | 2016-05-10 |
|\ | | | | | Updated load balancer proto to v1 | ||
* \ | Merge pull request #6320 from markdroth/limit_metadata_size | Jan Tattermusch | 2016-05-10 |
|\ \ | | | | | | | Add support for max metadata size. | ||
* \ \ | Merge pull request #6417 from stanley-cheung/php-stress-client | Jan Tattermusch | 2016-05-10 |
|\ \ \ | | | | | | | | | PHP: stress test client | ||
* \ \ \ | Merge pull request #6498 from jtattermusch/csharp_server_improvements | Jan Tattermusch | 2016-05-10 |
|\ \ \ \ | | | | | | | | | | | C# server performance improvements | ||
* \ \ \ \ | Merge pull request #6508 from nicolasnoble/master-sync | Nicolas Noble | 2016-05-10 |
|\ \ \ \ \ | | | | | | | | | | | | | Master sync | ||
| * | | | | | Merge remote-tracking branch 'google/release-0_14' into master-sync | Nicolas "Pixel" Noble | 2016-05-10 |
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile build.yaml composer.json package.json package.xml src/core/lib/surface/version.c src/csharp/Grpc.Core/VersionInfo.cs src/csharp/build_packages.bat src/node/tools/package.json src/python/grpcio/grpc_version.py src/ruby/lib/grpc/version.rb src/ruby/tools/version.rb 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 | ||
| * | | | | | Merge pull request #6507 from nicolasnoble/flagging-past-release | Nicolas Noble | 2016-05-10 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | The release branch is now 0.14.1-pre1. | ||
| | * | | | | | The release branch is now 0.14.1-pre1. | Nicolas "Pixel" Noble | 2016-05-10 |
| |/ / / / / | |||
| * | | | | | Merge pull request #6506 from nicolasnoble/flagging-release | Nicolas Noble | 2016-05-10 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Processing the 0.14 release. | ||
| | * | | | | | Processing the 0.14 release. | Nicolas "Pixel" Noble | 2016-05-10 |
| |/ / / / / | |||
* | | | | | | Merge pull request #6475 from grpc/release-0_14 | Nicolas Noble | 2016-05-09 |
|\| | | | | | | | | | | | | | | | | | Upmerge from 0.14.0 | ||
| * | | | | | Merge pull request #6495 from ↵ | Nicolas Noble | 2016-05-09 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | murgatroid99/backport_tools_package_bin_namespacing Backport tools package bin namespacing | ||
* | \ \ \ \ \ | Merge pull request #6480 from jcanizales/update-version-master | Nicolas Noble | 2016-05-09 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Update podspec versions in master branch | ||
| | | | * | | | | fix compilation on windows | Jan Tattermusch | 2016-05-09 |
| | | | | | | | | |||
| | * | | | | | | Merge pull request #6494 from murgatroid99/node_6_binaries | Nicolas Noble | 2016-05-09 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Build Node 6 artifacts | ||
* | | \ \ \ \ \ \ | Merge pull request #6448 from nathanielmanistaatgoogle/issue-4899 | Jan Tattermusch | 2016-05-09 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Raise parallelism in grpc._cython._channel_test | ||
* \ \ \ \ \ \ \ \ \ | Merge pull request #6421 from ctiller/mwha | Jan Tattermusch | 2016-05-09 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Exclude 1byte tests from msan | ||
* \ \ \ \ \ \ \ \ \ \ | Merge pull request #6452 from stanley-cheung/node-math-server-minor-bug | Jan Tattermusch | 2016-05-09 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Node: fix math server minor bug | ||
* \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #6433 from murgatroid99/tools_package_bin_namespacing | Nicolas Noble | 2016-05-09 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Make namespacing of executables exposed by grpc-tools packages consistent between Node and Ruby | ||
| | | | | | | | | * | | | | dont lock to run server_request_call | Jan Tattermusch | 2016-05-09 |
| | | | | | | | | | | | | | |||
| | | | | | | | | * | | | | expose experimental API to set GrpcThreadPool size. | Jan Tattermusch | 2016-05-09 |
| | | | | | | | | | | | | | |||
| | | | | | | | | * | | | | enable previously disabled C# scenarios | Jan Tattermusch | 2016-05-09 |
| | | | | | | | | | | | | | |||
| | | | | | | | | * | | | | dont create dedicated threads for async client | Jan Tattermusch | 2016-05-09 |
| | | | | | | | | | | | | | |||
| | | | | | | | | * | | | | start server with more than one allowed RPCs | Jan Tattermusch | 2016-05-09 |
| | | | | | | | | | | | | | |||
| | | | | | | | | * | | | | eliminate a thread switch when invoking server-side handler | Jan Tattermusch | 2016-05-09 |
| |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | Merge pull request #6462 from jtattermusch/benchmarking_unify_scenarios | Jan Tattermusch | 2016-05-09 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve benchmarking scenarios and enable "smoketest only" suite. | ||
| | | | | | | * \ \ \ \ \ | Merge pull request #6489 from jtattermusch/fully_qualify_task | Jan Tattermusch | 2016-05-09 |
| | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fully qualify System.Threading.Tasks.Task | ||
| | | | | | | | | | * | | | | Updated template file | murgatroid99 | 2016-05-09 |
| | | | | | | | | | | | | | | |||
| | | | | | | | | | * | | | | Make namespacing of executables exposed by grpc-tools packages consistent ↵ | murgatroid99 | 2016-05-09 |
| | | | | | | | |_|/ / / / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | between Node and Ruby | ||
| | | | | | | | | * | | | | Fixed earlier fix with the right command | murgatroid99 | 2016-05-09 |
| | | | | | | | | | | | | | |||
| | | | | | | | | * | | | | Use local copy of node-pre-gyp on Windows to ensure that it is up to date | murgatroid99 | 2016-05-09 |
| | | | | | | | | | | | | | |||
| | | | | | | | | * | | | | Build Node 6 artifacts | murgatroid99 | 2016-05-09 |
| | | | | | | | |/ / / / | | | | | | | |/| | | | | |||
| | | | | | | * | | | | | Merge pull request #6491 from soltanmm/license-to-nil | Jan Tattermusch | 2016-05-09 |
| | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add explicit license to grpcio-tools setup.py | ||
| | | | | | | | * | | | | | Add explicit license to grpcio-tools setup.py | Masood Malekghassemi | 2016-05-09 |
| | | | | | | |/ / / / / | |||
* | | | | | | | | | | | | Merge pull request #6440 from makdharma/bugfixes | Jorge Canizales | 2016-05-09 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | RouteGuide example now works with moving between tabs. Fixes issue 6404. | ||
| | | | | | | | * \ \ \ \ | Merge pull request #6490 from nicolasnoble/reversal | Craig Tiller | 2016-05-09 |
| | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge pull request #6214 from makdharma/master" | ||
| | | | | | | | * \ \ \ \ \ | Merge pull request #6483 from soltanmm/wind2 | Jan Tattermusch | 2016-05-09 |
| | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix windows linkage in Python grpcio-tools | ||
| | | | | | | | | | * | | | | | Revert "Merge pull request #6214 from makdharma/master" | Nicolas "Pixel" Noble | 2016-05-09 |
| | | | | | | | | |/ / / / / | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 48d833a9d8280216040ef731341502d7d0f157e4, reversing changes made to 66e9d8e8a7717d7ccece629df4454fc546e19daa. | ||
| | | | | | | | | | * | | | | regenerate C# code | Jan Tattermusch | 2016-05-09 |
| | | | | | | | | | | | | | | |||
| | | | | | | | | | * | | | | Fully qualify System.Threading.Tasks.Task | Kirill Katsnelson | 2016-05-09 |
| | | | | | | | | | | | | | | |||
| | | | | | | | * | | | | | | Merge pull request #6472 from murgatroid99/ruby_signal_handling2 | Jan Tattermusch | 2016-05-09 |
| | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Ruby library terminate on Ctrl+C on client and server | ||
* | | | | | | | | \ \ \ \ \ \ | Merge pull request #6400 from murgatroid99/ruby_empty_proto_package | Jan Tattermusch | 2016-05-09 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made ruby plugin support empty package names | ||
| | | | | | | | | * \ \ \ \ \ \ | Merge pull request #6476 from murgatroid99/ruby_service_defaults | Jan Tattermusch | 2016-05-09 |
| | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | |_|_|/ / / / | | | | | | | | | |/| | | | | | | Add a default handler to Ruby services that returns UNIMPLEMENTED | ||
* | | | | | | | | | | | | | | | | Merge pull request #6488 from grpc/revert-6214-master | Nicolas Noble | 2016-05-09 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "cronet wrapper code" | ||
| * | | | | | | | | | | | | | | | | Revert "cronet wrapper code" | Craig Tiller | 2016-05-09 |
|/ / / / / / / / / / / / / / / / | |||
| | | * | | | | | | | | | | | | | comment out the right scenario | Jan Tattermusch | 2016-05-08 |
| | | | | | | | | | | | | | | | | |||
| | | | | | | | | * | | | | | | | Merge pull request #6473 from jtattermusch/python_packages_fixes | Jan Tattermusch | 2016-05-07 |
| | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python packages fixes | ||
| | | | | | | | | | | | | * | | | | Fix windows linkage in Python grpcio-tools | Masood Malekghassemi | 2016-05-07 |
| | | | | | | | | | |_|_|/ / / / | | | | | | | | | |/| | | | | | | |||
| | | | | | | | * | | | | | | | | Move podspec to version 0.14 | Jorge Canizales | 2016-05-06 |
| | | | | | | | | | | | | | | | | |||
| | | | | | | | * | | | | | | | | Update BoringSSL podspec version. | Jorge Canizales | 2016-05-06 |
| | | | | | | | | | | | | | | | |