aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge pull request #6508 from nicolasnoble/master-syncGravatar Nicolas Noble2016-05-10
|\ | | | | Master sync
| * Merge remote-tracking branch 'google/release-0_14' into master-syncGravatar Nicolas "Pixel" Noble2016-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-releaseGravatar Nicolas Noble2016-05-10
| |\ | | | | | | The release branch is now 0.14.1-pre1.
| | * The release branch is now 0.14.1-pre1.Gravatar Nicolas "Pixel" Noble2016-05-10
| |/
| * Merge pull request #6506 from nicolasnoble/flagging-releaseGravatar Nicolas Noble2016-05-10
| |\ | | | | | | Processing the 0.14 release.
| | * Processing the 0.14 release.Gravatar Nicolas "Pixel" Noble2016-05-10
| |/
* | Merge pull request #6475 from grpc/release-0_14Gravatar Nicolas Noble2016-05-09
|\| | | | | Upmerge from 0.14.0
| * Merge pull request #6495 from ↵Gravatar Nicolas Noble2016-05-09
| |\ | | | | | | | | | | | | murgatroid99/backport_tools_package_bin_namespacing Backport tools package bin namespacing
* | \ Merge pull request #6480 from jcanizales/update-version-masterGravatar Nicolas Noble2016-05-09
|\ \ \ | | | | | | | | Update podspec versions in master branch
| | * \ Merge pull request #6494 from murgatroid99/node_6_binariesGravatar Nicolas Noble2016-05-09
| | |\ \ | | | | | | | | | | Build Node 6 artifacts
* | | \ \ Merge pull request #6448 from nathanielmanistaatgoogle/issue-4899Gravatar Jan Tattermusch2016-05-09
|\ \ \ \ \ | | | | | | | | | | | | Raise parallelism in grpc._cython._channel_test
* \ \ \ \ \ Merge pull request #6421 from ctiller/mwhaGravatar Jan Tattermusch2016-05-09
|\ \ \ \ \ \ | | | | | | | | | | | | | | Exclude 1byte tests from msan
* \ \ \ \ \ \ Merge pull request #6452 from stanley-cheung/node-math-server-minor-bugGravatar Jan Tattermusch2016-05-09
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Node: fix math server minor bug
* \ \ \ \ \ \ \ Merge pull request #6433 from murgatroid99/tools_package_bin_namespacingGravatar Nicolas Noble2016-05-09
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make namespacing of executables exposed by grpc-tools packages consistent between Node and Ruby
* \ \ \ \ \ \ \ \ Merge pull request #6462 from jtattermusch/benchmarking_unify_scenariosGravatar Jan Tattermusch2016-05-09
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve benchmarking scenarios and enable "smoketest only" suite.
| | | | | | | * \ \ Merge pull request #6489 from jtattermusch/fully_qualify_taskGravatar Jan Tattermusch2016-05-09
| | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | Fully qualify System.Threading.Tasks.Task
| | | | | | | | | | * Updated template fileGravatar murgatroid992016-05-09
| | | | | | | | | | |
| | | | | | | | | | * Make namespacing of executables exposed by grpc-tools packages consistent ↵Gravatar murgatroid992016-05-09
| | | | | | | | |_|/ | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | between Node and Ruby
| | | | | | | | | * Fixed earlier fix with the right commandGravatar murgatroid992016-05-09
| | | | | | | | | |
| | | | | | | | | * Use local copy of node-pre-gyp on Windows to ensure that it is up to dateGravatar murgatroid992016-05-09
| | | | | | | | | |
| | | | | | | | | * Build Node 6 artifactsGravatar murgatroid992016-05-09
| | | | | | | | |/ | | | | | | | |/|
| | | | | | | * | Merge pull request #6491 from soltanmm/license-to-nilGravatar Jan Tattermusch2016-05-09
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | Add explicit license to grpcio-tools setup.py
| | | | | | | | * | Add explicit license to grpcio-tools setup.pyGravatar Masood Malekghassemi2016-05-09
| | | | | | | |/ /
* | | | | | | | | Merge pull request #6440 from makdharma/bugfixesGravatar Jorge Canizales2016-05-09
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | RouteGuide example now works with moving between tabs. Fixes issue 6404.
| | | | | | | | * \ Merge pull request #6490 from nicolasnoble/reversalGravatar Craig Tiller2016-05-09
| | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | Revert "Merge pull request #6214 from makdharma/master"
| | | | | | | | * \ \ Merge pull request #6483 from soltanmm/wind2Gravatar Jan Tattermusch2016-05-09
| | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix windows linkage in Python grpcio-tools
| | | | | | | | | | * | Revert "Merge pull request #6214 from makdharma/master"Gravatar Nicolas "Pixel" Noble2016-05-09
| | | | | | | | | |/ / | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 48d833a9d8280216040ef731341502d7d0f157e4, reversing changes made to 66e9d8e8a7717d7ccece629df4454fc546e19daa.
| | | | | | | | | | * regenerate C# codeGravatar Jan Tattermusch2016-05-09
| | | | | | | | | | |
| | | | | | | | | | * Fully qualify System.Threading.Tasks.TaskGravatar Kirill Katsnelson2016-05-09
| | | | | | | | | | |
| | | | | | | | * | | Merge pull request #6472 from murgatroid99/ruby_signal_handling2Gravatar Jan Tattermusch2016-05-09
| | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make Ruby library terminate on Ctrl+C on client and server
* | | | | | | | | \ \ \ Merge pull request #6400 from murgatroid99/ruby_empty_proto_packageGravatar Jan Tattermusch2016-05-09
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Made ruby plugin support empty package names
| | | | | | | | | * \ \ \ Merge pull request #6476 from murgatroid99/ruby_service_defaultsGravatar Jan Tattermusch2016-05-09
| | | | | | | | | |\ \ \ \ | | | | | | | | | | |_|_|/ | | | | | | | | | |/| | | Add a default handler to Ruby services that returns UNIMPLEMENTED
* | | | | | | | | | | | | Merge pull request #6488 from grpc/revert-6214-masterGravatar Nicolas Noble2016-05-09
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "cronet wrapper code"
| * | | | | | | | | | | | | Revert "cronet wrapper code"Gravatar Craig Tiller2016-05-09
|/ / / / / / / / / / / / /
| | | * | | | | | | | | | comment out the right scenarioGravatar Jan Tattermusch2016-05-08
| | | | | | | | | | | | |
| | | | | | | | | * | | | Merge pull request #6473 from jtattermusch/python_packages_fixesGravatar Jan Tattermusch2016-05-07
| | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python packages fixes
| | | | | | | | | | | | | * Fix windows linkage in Python grpcio-toolsGravatar Masood Malekghassemi2016-05-07
| | | | | | | | | | |_|_|/ | | | | | | | | | |/| | |
| | | | | | | | * | | | | Move podspec to version 0.14Gravatar Jorge Canizales2016-05-06
| | | | | | | | | | | | |
| | | | | | | | * | | | | Update BoringSSL podspec version.Gravatar Jorge Canizales2016-05-06
| | | | | | | | | | | | |
| | | | | | | | * | | | | Depend on latest BoringSSLGravatar Jorge Canizales2016-05-06
| | | | | | | | | | | | |
| | | | | | | | * | | | | Have Cocoapods read from submodules too, for nanopbGravatar Jorge Canizales2016-05-06
| | | | | | | | | | | | |
| | | | | | | | * | | | | Move podspec to version 0.13Gravatar Jorge Canizales2016-05-06
| | | | | | | | | | | | |
| | | * | | | | | | | | | disable some C# scenariosGravatar Jan Tattermusch2016-05-06
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #6419 from sreecha/python_stress_test_dockerGravatar Jan Tattermusch2016-05-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python stress test docker config files and related changes
| | | | | | | | | | | | * | Add a default handler to Ruby services that returns UNIMPLEMENTEDGravatar murgatroid992016-05-06
| | | | | | | | | | | |/ / | | | | | | | | | | |/| |
* | | | | | | | | | | | | Merge pull request #6459 from nicolasnoble/upmergeGravatar Nicolas Noble2016-05-06
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manual upmerge from 0.14.0.
| | | | | | | | | | | | | * Poll for signals more frequently, for greater responsivenessGravatar murgatroid992016-05-06
| | | | | | | | | | | | | |
| | | | | | | | | | | | | * Added explanation about handling signals in CGravatar murgatroid992016-05-06
| | | | | | | | | | | | | |
| | | | | | | | | | | | * | rename grpc.protoc.compiler to grpc.tools.protocGravatar Jan Tattermusch2016-05-06
| | | | | | | | | | | | | |
| | | | | | | | | | | | * | fix python distribtests with docker on overlayGravatar Jan Tattermusch2016-05-06
| | | | | | | | | | | |/ /