Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into new_tsi | jiangtaoli2016 | 2017-04-15 |
|\ | |||
| * | Merge pull request #10664 from dgquintas/http_filter_slices | David G. Quintas | 2017-04-14 |
| |\ | | | | | | | Fix handling of slice in http_client_filter | ||
| * \ | Merge pull request #10440 from danzh2010/udpserver | Yang Gao | 2017-04-14 |
| |\ \ | | | | | | | | | Modify udp_server to postpone shutdown_fd() during shutdown. | ||
| * \ \ | Merge pull request #10634 from yang-g/fuzz2 | Yang Gao | 2017-04-14 |
| |\ \ \ | | | | | | | | | | | Disallow empty method slice in api_fuzzer | ||
| * \ \ \ | Merge pull request #10398 from ipylypiv/fix_uri_parser | Craig Tiller | 2017-04-14 |
| |\ \ \ \ | | | | | | | | | | | | | Refactor pchar_parse() to use switch() | ||
| * \ \ \ \ | Merge pull request #10626 from grpc/revert-10619-revert-9626-lazy-deframe | Muxi Yan | 2017-04-14 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Revert "Revert "Implement lazy deframe"" | ||
| | | | | | * | Fix handling of slice in http_client_filter | David Garcia Quintas | 2017-04-14 |
| | | | | | | | |||
| * | | | | | | Merge pull request #10661 from grpc/v1.3.x | Craig Tiller | 2017-04-14 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | 1.3.x upmerge | ||
| * \ \ \ \ \ \ | Merge pull request #10660 from ctiller/bugfixes | Craig Tiller | 2017-04-14 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | Bugfixes | ||
| * | | | | | | | Merge pull request #10494 from y-zeng/fix_server_keepalive | Yuchen Zeng | 2017-04-14 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix server-side keepalive shutdown process | ||
| * \ \ \ \ \ \ \ | Merge pull request #10631 from muxi/fix-xcode83-modulemap | Muxi Yan | 2017-04-14 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix modulemap redefinition problem in Xcode 8.3 | ||
| * \ \ \ \ \ \ \ \ | Merge pull request #10618 from yang-g/fuzz | Yang Gao | 2017-04-14 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix buffer overflow found by oss-fuzz | ||
| | * \ \ \ \ \ \ \ \ | merge with head | yang-g | 2017-04-14 |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||
| * | | | | | | | | | | Merge branch 'makdharma-caching_uri' | Makarand Dharmapurikar | 2017-04-14 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | Merge branch 'caching_uri' of https://github.com/makdharma/grpc into ↵ | Makarand Dharmapurikar | 2017-04-14 |
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | makdharma-caching_uri | ||
| * | | | | | | | | | | | Merge pull request #10583 from ctiller/server_start | Craig Tiller | 2017-04-14 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Threading robustness | ||
| | | | | | | | | * \ \ \ | Merge remote-tracking branch 'upstream/master' into ↵ | Muxi Yan | 2017-04-14 |
| | | | | | | | | |\ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | revert-10619-revert-9626-lazy-deframe | ||
| * | | | | | | | | | | | | Merge pull request #9972 from sreecha/cq_create_api_changes | Sree Kuchibhotla | 2017-04-14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Completion Queue creation API changes (C-Core and C++ only) | ||
| | | | | | | | * | | | | | | Fix broken test | Craig Tiller | 2017-04-14 |
| | | | | | | | | | | | | | | |||
| | | | | | | | * | | | | | | Fix broken test | Craig Tiller | 2017-04-14 |
| | | | | | | | | | | | | | | |||
| | | | | | | | * | | | | | | Fix broken test | Craig Tiller | 2017-04-14 |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | Merge pull request #10449 from ctiller/minimal_test | Craig Tiller | 2017-04-14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test of minimal stacks, and make it pass | ||
| | | | | | | | | * \ \ \ \ | Merge pull request #10641 from ctiller/truebin | Craig Tiller | 2017-04-14 |
| | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In all cases when writing, respect what the peer has asked for | ||
| | | | | | | | | | | * \ \ \ | Merge remote-tracking branch 'upstream/master' into ↵ | Muxi Yan | 2017-04-14 |
| | | | | | | | | | | |\ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | revert-10619-revert-9626-lazy-deframe | ||
| * | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change metadata names used by the instrumentation. | ||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ubsan fixes | ||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ | 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 pull request #10651 from dgquintas/master_merge_1.3 | David G. Quintas | 2017-04-13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge v1.3.x branch back into master | ||
| | * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/v1.3.x' into master_merge_1.3 | David Garcia Quintas | 2017-04-13 |
| |/| | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | Merge pull request #10650 from dgquintas/1.4.0_bump | David G. Quintas | 2017-04-13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master to 1.4.0-dev | ||
| | | * | | | | | | | | | | | | | | | Merge pull request #10648 from dgquintas/v1.3.x-version-bump | David G. Quintas | 2017-04-13 |
| | |/| | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.3.x branch cut, version bump PR | ||
| | | | | | | * | | | | | | | | | | | 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 |
| |/ / / / / / / / / / / / / / / / | |||
| | * / / / / / / / / / / / / / / | 1.3.x branch cut | David Garcia Quintas | 2017-04-13 |
| |/ / / / / / / / / / / / / / / | |||
| * | | | | | | | | | | | | | | | Merge pull request #10617 from murgatroid99/upmerge_1.2.4 | David G. Quintas | 2017-04-13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upmerge 1.2.4 into master | ||
| | | | | | * \ \ \ \ \ \ \ \ \ \ | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add check that we don't schedule the same closure twice at once. | ||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #10612 from markdroth/max_message_size_status_code | Mark D. Roth | 2017-04-13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use RESOURCE_EXHAUSTED for max message size limits. | ||
| | | | | | | | | | | | | | * | | | | | In all cases when writing, respect what the peer has asked for (not what the ↵ | Craig Tiller | 2017-04-13 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | peer has acknowledged we asked for) | ||
| | | | | | | | * | | | | | | | | | | fix mac issues | Sree Kuchibhotla | 2017-04-13 |
| | | | | | | | | | | | | | | | | | | |||
| | | | | | * | | | | | | | | | | | | Change metadata names used by the instrumentation. | Bogdan Drutu | 2017-04-13 |
| | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | Merge pull request #10633 from jboeuf/gpr_free_never_fails_on_null_input | jboeuf | 2017-04-13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Making sure that gpr_free is a no-op for NULL input. | ||
| | * | | | | | | | | | | | | | | | | Be more explicit about the contract for free_fn in the ↵ | Julien Boeuf | 2017-04-13 |
| |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gpr_allocation_functions doc. | ||
| | | | | | | | | * | | | | | | | | using grpc_base64_decode_with_len to simplify code | Makarand Dharmapurikar | 2017-04-13 |
| | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | Merge pull request #10625 from matt-kwong/fix-cpp-kokoro | Matt Kwong | 2017-04-13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in Kokoro scripts | ||
| | | | | | | | | | | * | | | | | | | get rid of the trailing null in path | yang-g | 2017-04-13 |
| | | | | | | | | | | | | | | | | | | |||
| | | | | * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_1.2.4 | murgatroid99 | 2017-04-13 |
| | |_|_|/| | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | |