Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into split-me-baby-one-more-time | Craig Tiller | 2016-03-31 |
|\ | |||
| * | Merge pull request #6030 from nicolasnoble/upmerge | Nicolas Noble | 2016-03-30 |
| |\ | | | | | | | Upmerge | ||
| | * | Merge branch 'release-0_13' into upmerge | Nicolas "Pixel" Noble | 2016-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-pre1 | Nicolas Noble | 2016-03-30 |
| | |\ | | | | | | | | | The release-0_13 branch is now 0.13.2-pre1. | ||
| * | \ | Merge pull request #5691 from ctiller/idempotent | Nicolas Noble | 2016-03-30 |
| |\ \ \ | | | | | | | | | | | Idempotent request support for core | ||
| | | | * | The release-0_13 branch is now 0.13.2-pre1. | Nicolas "Pixel" Noble | 2016-03-31 |
| | | |/ | |||
* | | | | Merge github.com:grpc/grpc into split-me-baby-one-more-time | Craig Tiller | 2016-03-30 |
|\| | | | |||
| * | | | Merge pull request #5699 from ctiller/accounting | Bogdan Drutu | 2016-03-30 |
| |\ \ \ | | | | | | | | | | | Introduce byte counting to the transport API | ||
| * \ \ \ | Merge pull request #5764 from ctiller/internal-canary | Nicolas Noble | 2016-03-30 |
| |\ \ \ \ | | | | | | | | | | | | | Initial canaries for downstream merges | ||
| | | | | * | Merge pull request #6026 from nicolasnoble/flagging-0.13.1 | Nicolas Noble | 2016-03-30 |
| | | | | |\ | | | | | | | | | | | | | | | Flagging the 0.13.1 release. | ||
| * | | | | \ | Merge pull request #5984 from jtattermusch/perf_tests_script | Jan Tattermusch | 2016-03-30 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add python script for running performance tests | ||
| * \ \ \ \ \ \ | Merge pull request #6021 from grpc/release-0_13 | Nicolas Noble | 2016-03-30 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | 0.13 a tiny upmerge | ||
| * | | | | | | | Merge pull request #5894 from soltanmm/stop-that | Jan Tattermusch | 2016-03-30 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Don't allow precompiled binaries in tests | ||
| * \ \ \ \ \ \ \ | Merge pull request #6025 from jtattermusch/csharp_refactor_building_take2 | Jan Tattermusch | 2016-03-30 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Refactor C# building in run_tests.py (revert a revert) | ||
| | * | | | | | | | | dont break mac build by EMBED_ZLIB=true again | Jan Tattermusch | 2016-03-30 |
| | | | | | | | | | | |||
| | * | | | | | | | | make C# mac build use same args as in artifact builder | Jan Tattermusch | 2016-03-30 |
| | | | | | | | | | | |||
| | | | | | | | | * | Flagging the 0.13.1 release. | Nicolas "Pixel" Noble | 2016-03-30 |
| | | | | |_|_|_|/ | | | | |/| | | | | |||
| * | | | | | | | | Merge pull request #5966 from jtattermusch/interop_worker_script | adelez | 2016-03-30 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add script to create interop worker | ||
| | * | | | | | | | | Add a comment. | Jan Tattermusch | 2016-03-30 |
| | | | | | | | | | | |||
| | | * | | | | | | | dont break the mac build | Jan Tattermusch | 2016-03-30 |
| | | | | | | | | | | |||
| | | * | | | | | | | disable C# arch choosing for now | Jan Tattermusch | 2016-03-30 |
| | | | | | | | | | | |||
| | | * | | | | | | | refactor C# building | Jan Tattermusch | 2016-03-30 |
| | | | | | | | | | | |||
| | | * | | | | | | | polish some .bat files | Jan Tattermusch | 2016-03-30 |
| | | | | | | | | | | |||
| | | * | | | | | | | always embed zlib and openssl for C# | Jan Tattermusch | 2016-03-30 |
| | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge branch 'accounting' into split-me-baby-one-more-time | Craig Tiller | 2016-03-30 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||
| * | | | | | | | | Fix merge error | Craig Tiller | 2016-03-30 |
| | | | | | | | | | |||
* | | | | | | | | | Merge branch 'accounting' into split-me-baby-one-more-time | Craig Tiller | 2016-03-30 |
|\| | | | | | | | | |||
| * | | | | | | | | Merge github.com:grpc/grpc into accounting | Craig Tiller | 2016-03-30 |
| |\| | | | | | | | |||
| | * | | | | | | | Merge pull request #6020 from grpc/revert-5963-csharp_refactor_building | Jan Tattermusch | 2016-03-30 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Revert "Refactor C# building in run_tests.py" | ||
| | * \ \ \ \ \ \ \ | Merge pull request #6022 from grpc/revert-5933-sockaddr_resolver_lb | Jan Tattermusch | 2016-03-30 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Revert "added grpclb support to sockaddr resolver" | ||
| | | * | | | | | | | | Revert "added grpclb support to sockaddr resolver" | Craig Tiller | 2016-03-30 |
| | |/ / / / / / / / | |||
* | | | | | | | | | | Merge branch 'accounting' into split-me-baby-one-more-time | Craig Tiller | 2016-03-30 |
|\| | | | | | | | | | |||
| | * | | | | | | | | Merge pull request #6014 from nicolasnoble/manual-upmerge | Jan Tattermusch | 2016-03-30 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Manual upmerge from 0.13 | ||
| * | | | | | | | | | | Merge github.com:grpc/grpc into accounting | Craig Tiller | 2016-03-30 |
| |\| | | | | | | | | | |||
| | | | * | | | | | | | Revert "Refactor C# building in run_tests.py" | Jan Tattermusch | 2016-03-30 |
| | | |/ / / / / / / | | |/| | | | | | | | |||
| | * | | | | | | | | Merge pull request #5933 from dgquintas/sockaddr_resolver_lb | Jan Tattermusch | 2016-03-30 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | added grpclb support to sockaddr resolver | ||
| | * \ \ \ \ \ \ \ \ | Merge pull request #5950 from dgquintas/lb_policies_new_interface | Jan Tattermusch | 2016-03-30 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Changes to resolver-LB interfaces. | ||
| | * \ \ \ \ \ \ \ \ \ | Merge pull request #5978 from dgquintas/channel_args_docs | Jan Tattermusch | 2016-03-30 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | small improvements to channel_args docstrings | ||
| | * \ \ \ \ \ \ \ \ \ \ | Merge pull request #5997 from vjpai/i_know_async | Jan Tattermusch | 2016-03-30 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Concurrent async server coverage in thread stress test | ||
| | | | | | | | | | * \ \ \ | Merge pull request #6008 from soltanmm/oops | Jan Tattermusch | 2016-03-30 |
| | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing dependencies | ||
| | * | | | | | | | | \ \ \ \ | Merge pull request #5963 from jtattermusch/csharp_refactor_building | Stanley Cheung | 2016-03-29 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor C# building in run_tests.py | ||
| | | | | | | | * | | | | | | | | Merge branch 'release-0_13' into manual-upmerge | Nicolas "Pixel" Noble | 2016-03-30 |
| | | |_|_|_|_|/| | | | | | | | | | |/| | | | | | | |/ / / / / | | | | | | | | | |/| | | | | | | | | | | | | |/| | | | | | | |||
| | | | | | | | * | | | | | | | Merge pull request #6004 from nicolasnoble/backport-of-5735 | Nicolas Noble | 2016-03-29 |
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of #5735 | ||
| | | | | | | | | | | | * | | | | Add missing dependencies | Masood Malekghassemi | 2016-03-29 |
| | | | | | | | | |_|_|/ / / / | | | | | | | | |/| | | | | | | |||
| | | | | | | | | * | | | | | | Better memory management for grpc_rb_byte_buffer_to_s. | Nicolas "Pixel" Noble | 2016-03-30 |
| | | | | | | | | | | | | | | | |||
| | | | | | | | | * | | | | | | Fix Ruby memory leaks | Zhuochun | 2016-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/uhoh | Craig Tiller | 2016-03-29 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trim number of CPUs | ||
| | | * | | | | | | | | | | | | Trim number of CPUs | Craig Tiller | 2016-03-29 |
| | |/ / / / / / / / / / / / | |||
| | * | | | | | | | | | | | | Merge pull request #5976 from earhart/master | Nicolas Noble | 2016-03-29 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for the GRPC Bazel build | ||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5979 from ctiller/gource | Nicolas Noble | 2016-03-29 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a script that generates a nice gource visualization |