Commit message (Expand) | Author | Age | |
---|---|---|---|
* | 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 |
| |\ | |||
| * \ | 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 |
|\ \ \ \ | |||
* \ \ \ \ | 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 pull request #6915 from markdroth/filter_api | kpayson64 | 2016-08-05 |
|\ \ \ \ | |||
* \ \ \ \ | 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 |
| * | | | | | Merge pull request #7370 from rjshade/move_timeout_encoding | kpayson64 | 2016-08-02 |
| |\ \ \ \ \ | |||
| | | * \ \ \ | Merge remote-tracking branch 'upstream/master' into filter_api | Mark D. Roth | 2016-08-02 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| * | | | | | | Merge pull request #6774 from a-veitch/add_resource | kpayson64 | 2016-08-02 |
| |\ \ \ \ \ \ | |||
| | | | * \ \ \ | Merge branch 'filter_call_init_failure' into filter_api | Mark D. Roth | 2016-08-02 |
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failure | Mark D. Roth | 2016-08-02 |
| |\ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-08-02 |
|\ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-08-01 |
| | | |\ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||
| | | | | | | * | | | refine code and add README | chedeti | 2016-08-01 |
| | | * | | | | | | | regenerated projects | David Garcia Quintas | 2016-08-01 |
| * | | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into lr_july_16 | David Garcia Quintas | 2016-08-01 |
| |\ \ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-08-01 |
| | | | |\ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | |||
| | | | | | | | * | | | thrift serializer | chedeti | 2016-07-31 |
| | | |_|_|_|_|/ / / | | |/| | | | | | | | |||
| | | | | | | | | * | Bumping to 1.0.0-pre2. | Nicolas "Pixel" Noble | 2016-07-29 |
* | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-07-27 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||
| | | | | | * | | | | Merge branch 'master' into move_timeout_encoding | Robbie Shade | 2016-07-26 |
| | | | | | |\ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||
| * | | | | | | | | | Merge pull request #7518 from nicolasnoble/plugins-should-compile | Nicolas Noble | 2016-07-25 |
| |\ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | * | | Remove references to string_ref_helper | Yuchen Zeng | 2016-07-25 |
| | | | | | | | | * | | Merge remote-tracking branch 'upstream/master' into cli_main | Yuchen Zeng | 2016-07-25 |
| | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-07-25 |
|\| | | | | | | | | | | |||
| | | | | | | | | * | | Remove unnecessary dependencies | Yuchen Zeng | 2016-07-25 |
| * | | | | | | | | | | Merge pull request #7451 from y-zeng/seperate_generated_files | kpayson64 | 2016-07-25 |
| |\ \ \ \ \ \ \ \ \ \ | |||
* | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-07-25 |
|\| | | | | | | | | | | | |||
| | | | | | | | | | * | | Command processing, validation | Yuchen Zeng | 2016-07-25 |
| | | * | | | | | | | | | We should always try to compile the protoc plugins when building tests. | Nicolas "Pixel" Noble | 2016-07-25 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||
| * | | | | | | | | | | Merge pull request #7395 from markdroth/handshake_api | kpayson64 | 2016-07-25 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||
| | | | | | | * | | | | merge to upstream/master | Alistair Veitch | 2016-07-21 |
| | | | | | | |\ \ \ \ | |||
| * | | | | | | \ \ \ \ | Merge pull request #7269 from y-zeng/cli_call | kpayson64 | 2016-07-21 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||
| | | | * | | | | | | | | Rerun generate_projects.sh | Yuchen Zeng | 2016-07-21 |
| | | | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into seperate_generated_files | Yuchen Zeng | 2016-07-21 |
| | | | |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||
| | | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into handshake_api | Mark D. Roth | 2016-07-20 |
| | | |\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | Makefile modifications and instructions to enable cross-compilation | Vijay Pai | 2016-07-19 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||
| | | | | | | | | | | * | Merge pull request #6737 from ctiller/delayed-write | Craig Tiller | 2016-07-19 |