aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge github.com:grpc/grpc into split-me-baby-one-more-timeGravatar Craig Tiller2016-03-31
|\
| * Merge pull request #6030 from nicolasnoble/upmergeGravatar Nicolas Noble2016-03-30
| |\ | | | | | | Upmerge
| | * Merge branch 'release-0_13' into upmergeGravatar Nicolas "Pixel" Noble2016-03-31
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile build.yaml package.json src/core/lib/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
| | * Merge pull request #6031 from nicolasnoble/0.13.2-pre1Gravatar Nicolas Noble2016-03-30
| | |\ | | | | | | | | The release-0_13 branch is now 0.13.2-pre1.
| * | \ Merge pull request #5691 from ctiller/idempotentGravatar Nicolas Noble2016-03-30
| |\ \ \ | | | | | | | | | | Idempotent request support for core
| | | | * The release-0_13 branch is now 0.13.2-pre1.Gravatar Nicolas "Pixel" Noble2016-03-31
| | | |/
* | | | Merge github.com:grpc/grpc into split-me-baby-one-more-timeGravatar Craig Tiller2016-03-30
|\| | |
| * | | Merge pull request #5699 from ctiller/accountingGravatar Bogdan Drutu2016-03-30
| |\ \ \ | | | | | | | | | | Introduce byte counting to the transport API
| * \ \ \ Merge pull request #5764 from ctiller/internal-canaryGravatar Nicolas Noble2016-03-30
| |\ \ \ \ | | | | | | | | | | | | Initial canaries for downstream merges
| | | | | * Merge pull request #6026 from nicolasnoble/flagging-0.13.1Gravatar Nicolas Noble2016-03-30
| | | | | |\ | | | | | | | | | | | | | | Flagging the 0.13.1 release.
| * | | | | \ Merge pull request #5984 from jtattermusch/perf_tests_scriptGravatar Jan Tattermusch2016-03-30
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add python script for running performance tests
| * \ \ \ \ \ \ Merge pull request #6021 from grpc/release-0_13Gravatar Nicolas Noble2016-03-30
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | 0.13 a tiny upmerge
| * | | | | | | Merge pull request #5894 from soltanmm/stop-thatGravatar Jan Tattermusch2016-03-30
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Don't allow precompiled binaries in tests
| * \ \ \ \ \ \ \ Merge pull request #6025 from jtattermusch/csharp_refactor_building_take2Gravatar Jan Tattermusch2016-03-30
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor C# building in run_tests.py (revert a revert)
| | * | | | | | | | dont break mac build by EMBED_ZLIB=true againGravatar Jan Tattermusch2016-03-30
| | | | | | | | | |
| | * | | | | | | | make C# mac build use same args as in artifact builderGravatar Jan Tattermusch2016-03-30
| | | | | | | | | |
| | | | | | | | | * Flagging the 0.13.1 release.Gravatar Nicolas "Pixel" Noble2016-03-30
| | | | | |_|_|_|/ | | | | |/| | | |
| * | | | | | | | Merge pull request #5966 from jtattermusch/interop_worker_scriptGravatar adelez2016-03-30
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add script to create interop worker
| | * | | | | | | | Add a comment.Gravatar Jan Tattermusch2016-03-30
| | | | | | | | | |
| | | * | | | | | | dont break the mac buildGravatar Jan Tattermusch2016-03-30
| | | | | | | | | |
| | | * | | | | | | disable C# arch choosing for nowGravatar Jan Tattermusch2016-03-30
| | | | | | | | | |
| | | * | | | | | | refactor C# buildingGravatar Jan Tattermusch2016-03-30
| | | | | | | | | |
| | | * | | | | | | polish some .bat filesGravatar Jan Tattermusch2016-03-30
| | | | | | | | | |
| | | * | | | | | | always embed zlib and openssl for C#Gravatar Jan Tattermusch2016-03-30
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'accounting' into split-me-baby-one-more-timeGravatar Craig Tiller2016-03-30
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Fix merge errorGravatar Craig Tiller2016-03-30
| | | | | | | | |
* | | | | | | | | Merge branch 'accounting' into split-me-baby-one-more-timeGravatar Craig Tiller2016-03-30
|\| | | | | | | |
| * | | | | | | | Merge github.com:grpc/grpc into accountingGravatar Craig Tiller2016-03-30
| |\| | | | | | |
| | * | | | | | | Merge pull request #6020 from grpc/revert-5963-csharp_refactor_buildingGravatar Jan Tattermusch2016-03-30
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Refactor C# building in run_tests.py"
| | * \ \ \ \ \ \ \ Merge pull request #6022 from grpc/revert-5933-sockaddr_resolver_lbGravatar Jan Tattermusch2016-03-30
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Revert "added grpclb support to sockaddr resolver"
| | | * | | | | | | | Revert "added grpclb support to sockaddr resolver"Gravatar Craig Tiller2016-03-30
| | |/ / / / / / / /
* | | | | | | | | | Merge branch 'accounting' into split-me-baby-one-more-timeGravatar Craig Tiller2016-03-30
|\| | | | | | | | |
| | * | | | | | | | Merge pull request #6014 from nicolasnoble/manual-upmergeGravatar Jan Tattermusch2016-03-30
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Manual upmerge from 0.13
| * | | | | | | | | | Merge github.com:grpc/grpc into accountingGravatar Craig Tiller2016-03-30
| |\| | | | | | | | |
| | | | * | | | | | | Revert "Refactor C# building in run_tests.py"Gravatar Jan Tattermusch2016-03-30
| | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge pull request #5933 from dgquintas/sockaddr_resolver_lbGravatar Jan Tattermusch2016-03-30
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | added grpclb support to sockaddr resolver
| | * \ \ \ \ \ \ \ \ Merge pull request #5950 from dgquintas/lb_policies_new_interfaceGravatar Jan Tattermusch2016-03-30
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Changes to resolver-LB interfaces.
| | * \ \ \ \ \ \ \ \ \ Merge pull request #5978 from dgquintas/channel_args_docsGravatar Jan Tattermusch2016-03-30
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | small improvements to channel_args docstrings
| | * \ \ \ \ \ \ \ \ \ \ Merge pull request #5997 from vjpai/i_know_asyncGravatar Jan Tattermusch2016-03-30
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Concurrent async server coverage in thread stress test
| | | | | | | | | | * \ \ \ Merge pull request #6008 from soltanmm/oopsGravatar Jan Tattermusch2016-03-30
| | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing dependencies
| | * | | | | | | | | \ \ \ \ Merge pull request #5963 from jtattermusch/csharp_refactor_buildingGravatar Stanley Cheung2016-03-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor C# building in run_tests.py
| | | | | | | | * | | | | | | | Merge branch 'release-0_13' into manual-upmergeGravatar Nicolas "Pixel" Noble2016-03-30
| | | |_|_|_|_|/| | | | | | | | | | |/| | | | | | | |/ / / / / | | | | | | | | | |/| | | | | | | | | | | | | |/| | | | | |
| | | | | | | | * | | | | | | Merge pull request #6004 from nicolasnoble/backport-of-5735Gravatar Nicolas Noble2016-03-29
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of #5735
| | | | | | | | | | | | * | | | Add missing dependenciesGravatar Masood Malekghassemi2016-03-29
| | | | | | | | | |_|_|/ / / / | | | | | | | | |/| | | | | |
| | | | | | | | | * | | | | | Better memory management for grpc_rb_byte_buffer_to_s.Gravatar Nicolas "Pixel" Noble2016-03-30
| | | | | | | | | | | | | | |
| | | | | | | | | * | | | | | Fix Ruby memory leaksGravatar Zhuochun2016-03-30
| | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `recv_message` is not cleaned up after call - `send_message` is not cleaned up in failure cases - `xmalloc` ruby string is not freed after used
| | * | | | | | | | | | | | Merge pull request #6003 from ctiller/uhohGravatar Craig Tiller2016-03-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trim number of CPUs
| | | * | | | | | | | | | | | Trim number of CPUsGravatar Craig Tiller2016-03-29
| | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge pull request #5976 from earhart/masterGravatar Nicolas Noble2016-03-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for the GRPC Bazel build
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #5979 from ctiller/gourceGravatar Nicolas Noble2016-03-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a script that generates a nice gource visualization