Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #6039 from ctiller/copyright-fix | 2016-03-31 | |
|\ | | | | | Remove year range requirement for copyright checker | ||
| * | Merge github.com:grpc/grpc into copyright-fix | 2016-03-31 | |
| |\ | |/ |/| | |||
* | | Merge pull request #5943 from vjpai/make_unix_sockets_great_again | 2016-03-31 | |
|\ \ | | | | | | | Fix the unix socket #ifdef in init.c | ||
* \ \ | Merge pull request #6000 from ctiller/optionalize_roundrobin | 2016-03-31 | |
|\ \ \ | | | | | | | | | Optionalize load balancing policies | ||
| | | * | Merge github.com:grpc/grpc into copyright-fix | 2016-03-31 | |
| | | |\ | |_|_|/ |/| | | | |||
| | | * | Update copyrights | 2016-03-31 | |
| | | | | |||
| | | * | Update tool | 2016-03-31 | |
| | | | | |||
* | | | | Merge pull request #6030 from nicolasnoble/upmerge | 2016-03-30 | |
|\ \ \ \ | | | | | | | | | | | Upmerge | ||
| * | | | | Merge branch 'release-0_13' into upmerge | 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 | 2016-03-30 | |
| |\ \ \ \ | | | | | | | | | | | | | The release-0_13 branch is now 0.13.2-pre1. | ||
* | \ \ \ \ | Merge pull request #5691 from ctiller/idempotent | 2016-03-30 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Idempotent request support for core | ||
| | | * | | | | The release-0_13 branch is now 0.13.2-pre1. | 2016-03-31 | |
| | |/ / / / | |||
* | | | | | | Merge pull request #5699 from ctiller/accounting | 2016-03-30 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Introduce byte counting to the transport API | ||
* \ \ \ \ \ \ | Merge pull request #5764 from ctiller/internal-canary | 2016-03-30 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Initial canaries for downstream merges | ||
| | | | * \ \ \ | Merge pull request #6026 from nicolasnoble/flagging-0.13.1 | 2016-03-30 | |
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | Flagging the 0.13.1 release. | ||
* | | | | \ \ \ \ | Merge pull request #5984 from jtattermusch/perf_tests_script | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add python script for running performance tests | ||
* \ \ \ \ \ \ \ \ \ | Merge pull request #6021 from grpc/release-0_13 | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | 0.13 a tiny upmerge | ||
* | | | | | | | | | | Merge pull request #5894 from soltanmm/stop-that | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Don't allow precompiled binaries in tests | ||
* \ \ \ \ \ \ \ \ \ \ | Merge pull request #6025 from jtattermusch/csharp_refactor_building_take2 | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Refactor C# building in run_tests.py (revert a revert) | ||
| | | | | | | | | * \ \ | Merge branch 'master' into optionalize_roundrobin | 2016-03-30 | |
| | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | dont break mac build by EMBED_ZLIB=true again | 2016-03-30 | |
| | | | | | | | | | | | | |||
| * | | | | | | | | | | | make C# mac build use same args as in artifact builder | 2016-03-30 | |
| | | | | | | | | | | | | |||
| | | | | | | | * | | | | Flagging the 0.13.1 release. | 2016-03-30 | |
| | | | |_|_|_|/ / / / | | | |/| | | | | | | | |||
* | | | | | | | | | | | Merge pull request #5966 from jtattermusch/interop_worker_script | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add script to create interop worker | ||
| * | | | | | | | | | | | Add a comment. | 2016-03-30 | |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | dont break the mac build | 2016-03-30 | |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | disable C# arch choosing for now | 2016-03-30 | |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | refactor C# building | 2016-03-30 | |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | polish some .bat files | 2016-03-30 | |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | always embed zlib and openssl for C# | 2016-03-30 | |
| |/ / / / / / / / / / |/| | | | | | | | | | | |||
| | | | | | * | | | | | Fix merge error | 2016-03-30 | |
| | | | | | | | | | | | |||
| | | | | | * | | | | | Merge github.com:grpc/grpc into accounting | 2016-03-30 | |
| | | | | | |\ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |||
| | | | | | | | * | | | Merge github.com:grpc/grpc into optionalize_roundrobin | 2016-03-30 | |
| | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |||
* | | | | | | | | | | | Merge pull request #6020 from grpc/revert-5963-csharp_refactor_building | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Refactor C# building in run_tests.py" | ||
| | | | | | | | | * \ \ | Merge github.com:grpc/grpc into optionalize_roundrobin | 2016-03-30 | |
| | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | Merge pull request #6022 from grpc/revert-5933-sockaddr_resolver_lb | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | Revert "added grpclb support to sockaddr resolver" | ||
| * | | | | | | | | | | | Revert "added grpclb support to sockaddr resolver" | 2016-03-30 | |
|/ / / / / / / / / / / | |||
* | | | | | | | | | | | Merge pull request #6014 from nicolasnoble/manual-upmerge | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Manual upmerge from 0.13 | ||
| | | | | | | | * \ \ \ | Merge github.com:grpc/grpc into accounting | 2016-03-30 | |
| | | | | | | | |\ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |||
| | * | | | | | | | | | | Revert "Refactor C# building in run_tests.py" | 2016-03-30 | |
| |/ / / / / / / / / / |/| | | | | | | | | | | |||
* | | | | | | | | | | | Merge pull request #5933 from dgquintas/sockaddr_resolver_lb | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | added grpclb support to sockaddr resolver | ||
* \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5950 from dgquintas/lb_policies_new_interface | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to resolver-LB interfaces. | ||
* \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5978 from dgquintas/channel_args_docs | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | small improvements to channel_args docstrings | ||
* \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5997 from vjpai/i_know_async | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Concurrent async server coverage in thread stress test | ||
| | | | | | | | * \ \ \ \ \ \ | Merge pull request #6008 from soltanmm/oops | 2016-03-30 | |
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing dependencies | ||
* | | | | | | | | \ \ \ \ \ \ \ | Merge pull request #5963 from jtattermusch/csharp_refactor_building | 2016-03-29 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor C# building in run_tests.py | ||
| | | | | | * | | | | | | | | | | | Merge branch 'release-0_13' into manual-upmerge | 2016-03-30 | |
| |_|_|_|_|/| | | | | | | | | | | |/| | | | | | | |/ / / / / / / / | | | | | | | |/| | | | | | | | | | | | | | |/| | | | | | | | | | |||
| | | | | | * | | | | | | | | | | Merge pull request #6004 from nicolasnoble/backport-of-5735 | 2016-03-29 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of #5735 | ||
| | | | | | | | | | * | | | | | | | Add missing dependencies | 2016-03-29 | |
| | | | | | | |_|_|/ / / / / / / | | | | | | |/| | | | | | | | | | |||
| | | | | | | * | | | | | | | | | Better memory management for grpc_rb_byte_buffer_to_s. | 2016-03-30 | |
| | | | | | | | | | | | | | | | |