Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Percent encoding routines | |||
| * \ \ \ \ \ \ \ \ | Merge pull request #7953 from makdharma/grpc_caching_test | Nicolas Noble | 2016-09-06 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | Grpc caching test | |||
| | | | | | | | * | | 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 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Move subchannel_call_holder code into client_channel module. | |||
| | | | | | * \ \ \ \ | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-09-01 | |
| | | | | | |\ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | ||||
| * | | | | | | | | | | Merge pull request #7936 from y-zeng/log_test | Craig Tiller | 2016-09-01 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add no-logging test | |||
| | | | | | | | | | | * | Merge branch 'client_channel_cleanup' into deadline_filter | Mark D. Roth | 2016-09-01 | |
| | | | | | | | | | | |\ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | ||||
| | | * | | | | | | | | | Move subchannel_call_holder code into client_channel module. | Mark D. Roth | 2016-08-31 | |
| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | add trace context proto | Alistair Veitch | 2016-08-31 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | ||||
| | | | | | | | | * | | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-08-31 | |
| | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||
* | | | | | | | | | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-08-30 | |
|\| | | | | | | | | | | ||||
| | * | | | | | | | | | Add no-logging test | Yuchen Zeng | 2016-08-30 | |
| |/ / / / / / / / / | ||||
| | | | | * | | | | | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-08-30 | |
| | | | | |\ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | ||||
| * | | | | | | | | | Merge pull request #7839 from markdroth/rename_client_config | Mark D. Roth | 2016-08-29 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Rename grpc_client_config to grpc_resolver_result. | |||
| | | * | | | | | | | | end-to-end test for cacheable requests. | Makarand Dharmapurikar | 2016-08-29 | |
| | | | | | | | | | | | ||||
| | | | | * | | | | | | Revert change to grpc++_base uses section | murgatroid99 | 2016-08-29 | |
| | | | | | | | | | | | ||||
| | | | | * | | | | | | build.yaml changes to make certain builds work | murgatroid99 | 2016-08-26 | |
| | | | | | | | | | | | ||||
| | | | | | | | * | | | Add list command | Yuchen Zeng | 2016-08-26 | |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||
| | | | | | | * | | | Re-run generate_projects.sh. | Mark D. Roth | 2016-08-26 | |
| | | | | | | | | | | ||||
| | | | | | | | | * | Initial code to move deadline timer into a filter. Timer cancellation | Mark D. Roth | 2016-08-26 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | not working right -- will fix in subsequent commit. | |||
| | | | | | | * | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | Mark D. Roth | 2016-08-25 | |
| | | | | | | |\ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | ||||
| | | | | | | * | | Add channel arg for max send message size and add message size filter. | Mark D. Roth | 2016-08-23 | |
| | | |_|_|_|/ / | | |/| | | | | | ||||
| | * | | | | | | Rename grpc_client_config to grpc_resolver_result. | Mark D. Roth | 2016-08-22 | |
| | | | | | | | | ||||
| | | | | * | | | Rename some files to avoid conflicting .obj files on Windows | Craig Tiller | 2016-08-22 | |
| | | | | | | | | ||||
| * | | | | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 2016-08-20 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | | | |_|/ / / | | |/| | | | | ||||
| | * | | | | | Bumping version to 1.0.1-pre1. | Nicolas "Pixel" Noble | 2016-08-18 | |
| | | | | | | | ||||
| | * | | | | | Merge pull request #7745 from nicolasnoble/no-more-pre | Nicolas Noble | 2016-08-18 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Removing pre2 flag. | |||
| | | | | * | | | Add a strict and a permissive decoder, allow different reserved alphabets | Craig Tiller | 2016-08-18 | |
| | | | | | | | | ||||
| | * | | | | | | Merge pull request #7752 from nicolasnoble/unsecure-should-be-unsecure | Nicolas Noble | 2016-08-18 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. | |||
| * | \ \ \ \ \ \ | Merge pull request #7741 from nicolasnoble/manual-upmerge | Nicolas Noble | 2016-08-18 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Manual upmerge from v1.0.x to master. | |||
| | | | | | | * | | | Percent encoding routines | Craig Tiller | 2016-08-18 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||
| * | | | | | | | | Merge pull request #7735 from y-zeng/cli_main_fork | kpayson64 | 2016-08-17 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Improve gRPC CLI | |||
| * \ \ \ \ \ \ \ \ | Merge pull request #7594 from chedeti/grpc-thrift-v2 | kpayson64 | 2016-08-17 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | grpc thrift integration | |||
| | | | | | * | | | | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. | Nicolas "Pixel" Noble | 2016-08-17 | |
| | | | | | | | | | | ||||
| | | | | | | * | | | Removing pre2 flag. | Nicolas "Pixel" Noble | 2016-08-16 | |
| | | | | | |/ / / | ||||
| | | | | * / / / | Update required protobuf version to v3.0.0 | Yuchen Zeng | 2016-08-15 | |
| | | | | |/ / / | ||||
| | | | * / / / | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | Nicolas "Pixel" Noble | 2016-08-16 | |
| | |_|/| | | | | |/| | |/ / / | ||||
| | | * | | | | Add CliCredentials, config_grpc_cli.h | Yuchen Zeng | 2016-08-15 | |
| | | | | | | | ||||
| | | * | | | | Merge remote-tracking branch 'upstream/master' into cli_main_fork | Yuchen Zeng | 2016-08-15 | |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | ||||
| | | | | | * | Merge branch 'handshaker_api' into http_connect | Mark D. Roth | 2016-08-11 | |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | ||||
| | | | * | | | Remove use of verify-install target in Makefile | murgatroid99 | 2016-08-10 | |
| | | | | | | |