Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into cares_buildin | Yuchen Zeng | 2016-08-24 |
|\ | |||
| * | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 2016-08-20 |
| |\ | |||
* | | | Remove improper ifdef | Yuchen Zeng | 2016-08-19 |
* | | | Remove dependency on node c-ares | Yuchen Zeng | 2016-08-19 |
* | | | Add back native resolver | Yuchen Zeng | 2016-08-18 |
| * | | Merge pull request #7762 from KindDragon/master | Nicolas Noble | 2016-08-18 |
| |\ \ | |||
| | * | | Fix CMake for Windows | Arkadiy Shapkin | 2016-08-18 |
* | | | | Merge remote-tracking branch 'upstream/master' into cares_buildin | Yuchen Zeng | 2016-08-17 |
|\| | | | |||
| * | | | 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 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||
* | | | | | Fix node on windows | Yuchen Zeng | 2016-08-16 |
* | | | | | Disable c-ares on windows | Yuchen Zeng | 2016-08-16 |
| | | | * | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. | Nicolas "Pixel" Noble | 2016-08-17 |
| | | * | | 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 |
| | | |\ \ | | |_|/ / | |/| | | | |||
* | | | | | Fix python build | Yuchen Zeng | 2016-08-11 |
* | | | | | Merge remote-tracking branch 'upstream/master' into cares | Yuchen Zeng | 2016-08-08 |
|\| | | | | |||
* | | | | | Separate event driver from ares wrapper | Yuchen Zeng | 2016-08-08 |
| * | | | | Merge pull request #6915 from markdroth/filter_api | kpayson64 | 2016-08-05 |
| |\ \ \ \ | |||
* | | | | | | Merge remote-tracking branch 'upstream/master' into cares | Yuchen Zeng | 2016-08-05 |
|\| | | | | | |||
* | | | | | | Implement c-ares based dns resolver | Yuchen Zeng | 2016-08-05 |
| * | | | | | Forgot one file | Nicolas "Pixel" Noble | 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 |
| | * | | | | | 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 |
| | | | |_|_|_|_|/ / / | | | |/| | | | | | | | |||
* | | / | | | | | | | | Add c-ares in Makefile.template | Yuchen Zeng | 2016-07-28 |
| |_|/ / / / / / / / |/| | | | | | | | | | |||
| | | | | | * | | | | Merge branch 'master' into move_timeout_encoding | Robbie Shade | 2016-07-26 |
| | | | | | |\ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||
| | | | | | | | * | | 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 |
* | | | | | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |||
| | | | * | | | | | | | Splitting interop_server.cc | Nicolas "Pixel" Noble | 2016-07-18 |
| |_|_|/ / / / / / / |/| | | | | | | | | | |||
| | | * | | | | | | | Separate generated file and protobuf dependency | Yuchen Zeng | 2016-07-18 |
| |_|/ / / / / / / |/| | | | | | | | |