Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into fake_resolver | Mark D. Roth | 2016-10-04 |
|\ | |||
* | | Add fake resolver for tests. | Mark D. Roth | 2016-10-03 |
| * | Merge pull request #8179 from stanley-cheung/php-proto3-pr | Stanley Cheung | 2016-10-03 |
| |\ | |||
| * | | Merge pull request #8205 from ctiller/crashy | Craig Tiller | 2016-10-03 |
|/| | | |||
| | * | PHP Proto3: run generate_projects.sh | Stanley Cheung | 2016-09-29 |
| |/ |/| | |||
* | | Merge branch 'master' of https://github.com/grpc/grpc into master-upmerge-fro... | Nicolas "Pixel" Noble | 2016-09-29 |
|\ \ | |||
* \ \ | Merge remote-tracking branch 'google/v1.0.x' into master-upmerge-from-deep-under | Nicolas "Pixel" Noble | 2016-09-29 |
|\ \ \ | |||
| | | * | Fixes | Craig Tiller | 2016-09-26 |
| | | * | Cleanup test, check fail fast or not | Craig Tiller | 2016-09-26 |
| |_|/ |/| | | |||
| | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-23 |
| | |\ | |_|/ |/| | | |||
* | | | Merge pull request #7611 from markdroth/http_connect | Mark D. Roth | 2016-09-23 |
|\ \ \ | |||
| * | | | Ran generate_projects.sh. | Mark D. Roth | 2016-09-22 |
* | | | | Merge remote-tracking branch 'upstream/master' into cli_list | Yuchen Zeng | 2016-09-21 |
|\ \ \ \ | |||
| | * \ \ | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-09-21 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-21 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | | * | | Backport of #8055 into v1.0.x. | Nicolas "Pixel" Noble | 2016-09-20 |
| * | | | | Merge pull request #8052 from Vizerai/grpc_tracing | Jim King | 2016-09-19 |
| |\ \ \ \ | |||
| | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-19 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | | * | | | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-09-16 |
| | | |\ \ \ | |||
| | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-16 |
| | | | | | |\ | | | | | |_|/ | | | | |/| | | |||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | Mark D. Roth | 2016-09-16 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||
| | * | | | | | Merge pull request #8069 from grpc/revert-8068-revert-7279-grand-unified-clos... | Craig Tiller | 2016-09-16 |
| | |\ \ \ \ \ | |||
| | | | | * \ \ | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-09-16 |
| | | | | |\ \ \ | | | |_|_|/ / / | | |/| | | | | | |||
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | Mark D. Roth | 2016-09-16 |
| |\| | | | | | | |||
| | * | | | | | | Merge pull request #7996 from yang-g/canonical | Yang Gao | 2016-09-15 |
| | |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge pull request #7559 from dgquintas/codegen_cleanse | Craig Tiller | 2016-09-13 |
| | |\ \ \ \ \ \ \ | |||
| | | | | | | * \ \ | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-09-13 |
| | | | | | | |\ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | |||
| | | | | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-12 |
| | | | | | | | | |\ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||
| | | | | * | | | | | Revert "Revert "Grand unified closures"" | Craig Tiller | 2016-09-12 |
| | | |_|/ / / / / | | |/| | | | | | | |||
| | * | | | | | | | Revert "Grand unified closures" | Craig Tiller | 2016-09-12 |
| | | | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-12 |
| | | | | | | | |\ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||
* | | | | | | | | | Merge remote-tracking branch 'upstream/master' into cli_list | Yuchen Zeng | 2016-09-12 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||
| | | | | * | | | | initial commit of tracing context files | Vizerai | 2016-09-09 |
| | | | * | | | | | Add a helper to get canonical code from status | yang-g | 2016-09-09 |
| | | | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-09 |
| | | | | | | | |\ | | | | | | |_|_|/ | | | | | |/| | | | |||
| * | | | | | | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-09-08 |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||
| | | * | | | | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | Mark D. Roth | 2016-09-08 |
| | | |\ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||
| | * | | | | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | Nicolas "Pixel" Noble | 2016-09-08 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | |||
| * | | | | | | | | Fix merge error | Craig Tiller | 2016-09-07 |
| | | | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-07 |
| | | | | | | | |\ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||
| | | | | | | * | | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-09-07 |
| | | | | | | |\ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||
| * | | | | | | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-09-07 |
| |\| | | | | | | | |||
| | * | | | | | | | Merge pull request #7774 from ctiller/percent-encoder | Craig Tiller | 2016-09-06 |
| | |\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ | Merge pull request #7953 from makdharma/grpc_caching_test | Nicolas Noble | 2016-09-06 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | |||
| | | | | | | | * | | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-09-06 |
| | | | | | | | |\ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||
| | | | | | * | | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | Mark D. Roth | 2016-09-06 |
| | | | | | |\ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||
| * | | | | | | | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-09-02 |
| |\| | | | | | | | | |||
| | | | | | | * | | | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-09-02 |
| | | | | | | |\ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | |||
| | | | | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-01 |
| | | | | | | | | |\ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||
| | * | | | | | | | | Merge pull request #7943 from markdroth/client_channel_cleanup | Mark D. Roth | 2016-09-01 |
| | |\ \ \ \ \ \ \ \ |