Commit message (Expand) | Author | Age | |
---|---|---|---|
* | 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 |
|\ \ | |||
* | | | Revert "Grand unified closures" | Craig Tiller | 2016-09-12 |
| | * | Add a helper to get canonical code from status | yang-g | 2016-09-09 |
* | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 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 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 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 pull request #7943 from markdroth/client_channel_cleanup | Mark D. Roth | 2016-09-01 |
| |\ \ \ \ \ | |||
| | | | | | * | 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 |
| |\ \ \ \ \ \ | |||
| | | * | | | | | 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 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 |
| |\ \ \ \ \ | |||
| | | * | | | | 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 |
| | * | | | | | 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 |
| | |\ \ \ \ | |||
| | | | | * | | 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 |
| | |\ \ \ \ \ | |||
| * | \ \ \ \ \ | Merge pull request #7741 from nicolasnoble/manual-upmerge | Nicolas Noble | 2016-08-18 |
| |\ \ \ \ \ \ \ | |||
| | | | | | | * | | Percent encoding routines | Craig Tiller | 2016-08-18 |
| | |_|_|_|_|/ / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #7735 from y-zeng/cli_main_fork | kpayson64 | 2016-08-17 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge pull request #7594 from chedeti/grpc-thrift-v2 | kpayson64 | 2016-08-17 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||
| | | | | | * | | | 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 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| | | | * | | Remove use of verify-install target in Makefile | murgatroid99 | 2016-08-10 |
| | | | * | | Remove warning about protobuf 3.0.0+ from the Makefile | murgatroid99 | 2016-08-10 |
* | | | | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-08-09 |
|\| | | | | | |||
| * | | | | | Merge pull request #6915 from markdroth/filter_api | kpayson64 | 2016-08-05 |
| |\ \ \ \ \ | |||
* | | | | | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-08-04 |
|\| | | | | | | |||
* | | | | | | | generate projects | Craig Tiller | 2016-08-04 |
* | | | | | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-08-04 |
|\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-08-04 |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| * | | | | | | | regenerated projects | David Garcia Quintas | 2016-08-03 |