Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | | | | | | | | | | | | * | | Expanded comment about Client class in stress_client | murgatroid99 | 2016-03-31 | |
| | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | * | | | | Merge github.com:grpc/grpc into optionalize_census | Craig Tiller | 2016-03-31 | |
| | | | | | | | | | | | |\ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | | * | clang-format | Craig Tiller | 2016-03-31 | |
| | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | | * | Fix windows pollset initialization | Craig Tiller | 2016-03-31 | |
| | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | | * | Merge github.com:grpc/grpc into cleaner-posix2 | Craig Tiller | 2016-03-31 | |
| | | | | | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | ||||
| | | | | | | | | * | | | | | | | Merge branch 'master' into stress_exit_codes | Sree Kuchibhotla | 2016-03-31 | |
| | | | | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | ||||
| | | | | | | | | * | | | | | | | Merge branch 'master' into stress_exit_codes | Sree Kuchibhotla | 2016-03-31 | |
| | | | | | | | | |\ \ \ \ \ \ \ | ||||
| | | | | | | | | * | | | | | | | | Reduce log verbosity of stress_test client by default. Correct a typo | Sree Kuchibhotla | 2016-03-31 | |
| | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | * | | | | | Merge branch 'master' of github.com:grpc/grpc into lb_resolvers | David Garcia Quintas | 2016-03-31 | |
| | | | | | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | Merge branch 'master' into i_know_virtual_destructors | Vijay Pai | 2016-03-31 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | Add virtual destructor to satisfy a requirement of some compilers | vjpai | 2016-03-31 | |
| | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | Merge pull request #5943 from vjpai/make_unix_sockets_great_again | Nicolas Noble | 2016-03-31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the unix socket #ifdef in init.c | |||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:grpc/grpc into uri_query_parts | David Garcia Quintas | 2016-03-31 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | Added grpc_uri_get_query_arg per comments. | David Garcia Quintas | 2016-03-31 | |
| | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | | | | * | Remove errant include | Craig Tiller | 2016-03-31 | |
| | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | Merge pull request #6000 from ctiller/optionalize_roundrobin | Nicolas Noble | 2016-03-31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | Optionalize load balancing policies | |||
| | | * | | | | | | | | | | | | | | | Merge github.com:grpc/grpc into copyright-fix | Craig Tiller | 2016-03-31 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | Update copyrights | Craig Tiller | 2016-03-31 | |
| | | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | Update tool | Craig Tiller | 2016-03-31 | |
| | | | | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | | | | Added & and = to URI queries | David Garcia Quintas | 2016-03-30 | |
| | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | 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 branch 'master' into node_stress_client | murgatroid99 | 2016-03-30 | |
| | | | | | | | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | * | | | | | | | | Fix docs | Sree Kuchibhotla | 2016-03-30 | |
| | | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | Merge pull request #5691 from ctiller/idempotent | Nicolas Noble | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Idempotent request support for core | |||
| | | | | | | | | | | | | | | | | | * | | Fixed minor bug in metrics server, added metrics client | murgatroid99 | 2016-03-30 | |
| | | | | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | | | The release-0_13 branch is now 0.13.2-pre1. | Nicolas "Pixel" Noble | 2016-03-31 | |
| | |/ / / / / / / / / / / / / / / / / | ||||
| | | | | | | | | | | | | | | | | | * | Remove removed files from build.yaml | Craig Tiller | 2016-03-30 | |
| | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | | | | | * | Merge github.com:grpc/grpc into cleaner-posix2 | Craig Tiller | 2016-03-30 | |
| | | | | | | | | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | | | | | * | Merge branch 'cleaner-posix2' of github.com:ctiller/grpc into cleaner-posix2 | Craig Tiller | 2016-03-30 | |
| | | | | | | | | | | | | | | | | | |\ | ||||
| | | | | | | | | | | | | | | | | | * | | Add compilation guards for posix only code | Craig Tiller | 2016-03-30 | |
| | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | * | | | | | | | | | | | | Zero out memory to avoid msan failure | Craig Tiller | 2016-03-30 | |
| | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | * | | | | | | | | | | | | Merge github.com:grpc/grpc into we-are-never-ever-ever | 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. | |||
| | | | | | | | | | | | | | | | | | | | * | | | Node stress test client | murgatroid99 | 2016-03-30 | |
| | | | | | | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | | | | 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 | |||
| | | | | | | | | | | | | * | | | | | | | | | | fix typo in STRESS_CLIENT_SPEC.md | Menghan Li | 2016-03-30 | |
| |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | | | 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) | |||
| | | | | | | | | | | | | | | | | | | | * \ \ \ | Merge branch 'master' into i_know_rubies | Vijay Pai | 2016-03-30 | |
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | * | | | | | | | | | | | | | | | Merge branch 'master' into optionalize_roundrobin | Craig Tiller | 2016-03-30 | |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | | | | | | | * | | | | Support secure client | vjpai | 2016-03-30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | * | | | | | | | | | | | | | | | | Flagging the 0.13.1 release. | Nicolas "Pixel" Noble | 2016-03-30 | |
| | | | |_|_|_|/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | * | | | | | | | | | Added a few more corpora. | Nicolas "Pixel" Noble | 2016-03-30 | |
| | | | | | | | | | | | | | | | | | | | | | | |