Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #10494 from y-zeng/fix_server_keepalive | Yuchen Zeng | 2017-04-14 |
|\ | |||
* \ | Merge pull request #10631 from muxi/fix-xcode83-modulemap | Muxi Yan | 2017-04-14 |
|\ \ | |||
* \ \ | Merge branch 'caching_uri' of https://github.com/makdharma/grpc into makdharm... | Makarand Dharmapurikar | 2017-04-14 |
|\ \ \ | |||
* \ \ \ | Merge pull request #10583 from ctiller/server_start | Craig Tiller | 2017-04-14 |
|\ \ \ \ | |||
* \ \ \ \ | Merge pull request #9972 from sreecha/cq_create_api_changes | Sree Kuchibhotla | 2017-04-14 |
|\ \ \ \ \ | |||
* \ \ \ \ \ | Merge pull request #10449 from ctiller/minimal_test | Craig Tiller | 2017-04-14 |
|\ \ \ \ \ \ | |||
* | | | | | | | Use _pb2_grpc module to access gRPC entities | Mehrdad Afshari | 2017-04-13 |
* | | | | | | | Merge pull request #10405 from bogdandrutu/metadata | David G. Quintas | 2017-04-13 |
|\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge github.com:grpc/grpc into minimal_test | Craig Tiller | 2017-04-13 |
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||
* | | | | | | | | Merge pull request #10630 from ctiller/ubsan | Craig Tiller | 2017-04-13 |
|\ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ | Merge branch 'master' into cq_create_api_changes | Sree Kuchibhotla | 2017-04-13 |
| | | | |\ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||
| | | | | | | * | | Remove arm_arch and hack version number | Muxi Yan | 2017-04-13 |
| | | | * | | | | | Merge branch 'master' into cq_create_api_changes | Sree Kuchibhotla | 2017-04-13 |
| | | | |\ \ \ \ \ | |||
* | | | | | | | | | | master to 1.4.0-dev | David Garcia Quintas | 2017-04-13 |
| |_|_|_|/ / / / / |/| | | | | | | | | |||
* | | | | | | | | | Merge pull request #10617 from murgatroid99/upmerge_1.2.4 | David G. Quintas | 2017-04-13 |
|\ \ \ \ \ \ \ \ \ | |||
| | | | | * \ \ \ \ | Merge branch 'master' into cq_create_api_changes | Sree Kuchibhotla | 2017-04-13 |
| | | | | |\ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #10475 from markdroth/closure_debug_schedule_check | Mark D. Roth | 2017-04-13 |
|\ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ | Merge pull request #10612 from markdroth/max_message_size_status_code | Mark D. Roth | 2017-04-13 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | * | | | | | fix mac issues | Sree Kuchibhotla | 2017-04-13 |
| | | | | * | | | | | | | Change metadata names used by the instrumentation. | Bogdan Drutu | 2017-04-13 |
| |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||
| | | | | | | | * | | | using grpc_base64_decode_with_len to simplify code | Makarand Dharmapurikar | 2017-04-13 |
| | | * | | | | | | | | Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_1.2.4 | murgatroid99 | 2017-04-13 |
| |_|/| | | | | | | | |/| | | | | | | | | | | |||
| | | | * | | | | | | | ubsan fixes | Craig Tiller | 2017-04-13 |
| |_|_|/ / / / / / / |/| | | | | | | | | | |||
| | | | * | | | | | | Merge github.com:grpc/grpc into minimal_test | Craig Tiller | 2017-04-13 |
| | | | |\ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #10605 from ctiller/ubsan | Craig Tiller | 2017-04-13 |
|\ \ \ \ \ \ \ \ \ \ | |||
| | | | | | * \ \ \ \ | Merge branch 'master' into cq_create_api_changes | Sree Kuchibhotla | 2017-04-13 |
| | | | | | |\ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |||
| | | | | | * | | | | | Add shutdown_cq as a server cq so that progress can be made when calling cq_p... | Sree Kuchibhotla | 2017-04-13 |
| | | | | | | | | | * | Add GRPC_CHTTP2_KEEPALIVE_STATE_DISABLED | Yuchen Zeng | 2017-04-12 |
* | | | | | | | | | | | Merge pull request #10616 from apolcyn/fix_csharp_test_docker_build | apolcyn | 2017-04-12 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | * | | Fix modulemap redefinition | Muxi Yan | 2017-04-12 |
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||
* | | | | | | | | | | | Merge pull request #10586 from yang-g/error_details2 | Yang Gao | 2017-04-12 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | * \ \ \ \ | Merge github.com:grpc/grpc into minimal_test | Craig Tiller | 2017-04-12 |
| | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | Revert "Implement lazy deframe" | Craig Tiller | 2017-04-12 |
| | | | | | | | | * | | | Merge github.com:grpc/grpc into server_start | Craig Tiller | 2017-04-12 |
| | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |||
| | | | | | | * | | | | | add missing refs | Craig Tiller | 2017-04-12 |
| | | | | | | * | | | | | Merge github.com:grpc/grpc into minimal_test | Craig Tiller | 2017-04-12 |
| | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | Merge pull request #10473 from ctiller/truebin | Craig Tiller | 2017-04-12 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | remove src/csharp/global.json | Alexander Polcyn | 2017-04-12 |
| |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | Merge pull request #10598 from jtattermusch/manual_upmerge_v12x | David G. Quintas | 2017-04-12 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #9626 from muxi/lazy-deframe | Muxi Yan | 2017-04-12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | * | | | | Create f->shutdown_cq in the fixture | Sree Kuchibhotla | 2017-04-12 |
| | | | | | | | | | * | | | | Merge branch 'master' into cq_create_api_changes | Sree Kuchibhotla | 2017-04-12 |
| | | | | | | | | | |\ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | |||
| | | | | | | | | | | | * | | fixed asan buffer overflow | Makarand Dharmapurikar | 2017-04-12 |
| | | | | | * | | | | | | | | Fix message_size_filter to use RESOURCE_EXHAUSTED status code. | Mark D. Roth | 2017-04-12 |
| |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge pull request #10566 from muxi/fix-trailer-only | Muxi Yan | 2017-04-12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | | * \ | Merge remote-tracking branch 'refs/remotes/origin/master' into caching_uri | Makarand Dharmapurikar | 2017-04-12 |
| | | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | Merge pull request #10540 from muxi/restore-cronet-tests | Muxi Yan | 2017-04-12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | * | | | | | | Bump version to 1.2.4 | murgatroid99 | 2017-04-12 |
| | | | | | | | | * | | | | | | Merge pull request #10563 from murgatroid99/node_server_shutdown | Michael Lumish | 2017-04-12 |
| | | | | | | | | |\ \ \ \ \ \ | |||
| | | | | | | * | | | | | | | | | ubsan fixes | Craig Tiller | 2017-04-12 |