Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into cares_buildin | 2016-09-01 | |
|\ | |||
| * | Merge pull request #7943 from markdroth/client_channel_cleanup | 2016-09-01 | |
| |\ | | | | | | | Move subchannel_call_holder code into client_channel module. | ||
| * \ | Merge pull request #7936 from y-zeng/log_test | 2016-09-01 | |
| |\ \ | | | | | | | | | Add no-logging test | ||
| | | * | Move subchannel_call_holder code into client_channel module. | 2016-08-31 | |
| | | | | |||
| * | | | add trace context proto | 2016-08-31 | |
| | |/ | |/| | |||
| | * | Add no-logging test | 2016-08-30 | |
| |/ | |||
| * | Merge pull request #7839 from markdroth/rename_client_config | 2016-08-29 | |
| |\ | | | | | | | Rename grpc_client_config to grpc_resolver_result. | ||
* | | | Merge remote-tracking branch 'upstream/master' into cares_buildin | 2016-08-24 | |
|\| | | |||
| | * | Rename grpc_client_config to grpc_resolver_result. | 2016-08-22 | |
| | | | |||
| * | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | 2016-08-20 | |
| |\ \ | | |/ | |/| | |||
* | | | Remove improper ifdef | 2016-08-19 | |
| | | | |||
* | | | Remove dependency on node c-ares | 2016-08-19 | |
| | | | |||
* | | | Add back native resolver | 2016-08-18 | |
| | | | |||
| * | | Merge pull request #7762 from KindDragon/master | 2016-08-18 | |
| |\ \ | | | | | | | | | Fix CMake for windows (VS2015) | ||
| | * | | Fix CMake for Windows | 2016-08-18 | |
| | | | | |||
* | | | | Merge remote-tracking branch 'upstream/master' into cares_buildin | 2016-08-17 | |
|\| | | | |||
| * | | | Merge pull request #7735 from y-zeng/cli_main_fork | 2016-08-17 | |
| |\ \ \ | | | | | | | | | | | Improve gRPC CLI | ||
| * \ \ \ | Merge pull request #7594 from chedeti/grpc-thrift-v2 | 2016-08-17 | |
| |\ \ \ \ | | |_|/ / | |/| | | | grpc thrift integration | ||
* | | | | | Fix node on windows | 2016-08-16 | |
| | | | | | |||
* | | | | | Disable c-ares on windows | 2016-08-16 | |
| | | | | | |||
| | | | * | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. | 2016-08-17 | |
| | | | | | |||
| | | * | | Add CliCredentials, config_grpc_cli.h | 2016-08-15 | |
| | | | | | |||
| | | * | | Merge remote-tracking branch 'upstream/master' into cli_main_fork | 2016-08-15 | |
| | | |\ \ | | |_|/ / | |/| | | | |||
* | | | | | Fix python build | 2016-08-11 | |
| | | | | | |||
* | | | | | Merge remote-tracking branch 'upstream/master' into cares | 2016-08-08 | |
|\| | | | | |||
* | | | | | Separate event driver from ares wrapper | 2016-08-08 | |
| | | | | | |||
| * | | | | Merge pull request #6915 from markdroth/filter_api | 2016-08-05 | |
| |\ \ \ \ | | | | | | | | | | | | | Implement C++ API for defining channel filters. | ||
* | | | | | | Merge remote-tracking branch 'upstream/master' into cares | 2016-08-05 | |
|\| | | | | | |||
* | | | | | | Implement c-ares based dns resolver | 2016-08-05 | |
| | | | | | | |||
| * | | | | | Forgot one file | 2016-08-04 | |
| | | | | | | |||
| * | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-08-04 | |
| |\ \ \ \ \ | |||
| | * | | | | | regenerated projects | 2016-08-03 | |
| | | | | | | | |||
| | * | | | | | Merge pull request #7370 from rjshade/move_timeout_encoding | 2016-08-02 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Move timeout_encoding to core/lib/transport | ||
| | | | * \ \ \ | Merge remote-tracking branch 'upstream/master' into filter_api | 2016-08-02 | |
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||
| | * | | | | | | Merge pull request #6774 from a-veitch/add_resource | 2016-08-02 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add Census resource API and implementation. | ||
| | | | | * \ \ \ | Merge branch 'filter_call_init_failure' into filter_api | 2016-08-02 | |
| | | | | |\ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failure | 2016-08-02 | |
| | |\ \ \ \ \ \ \ | |||
| * | \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-08-02 | |
| |\ \ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-08-01 | |
| | | | |\ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | |||
| | | | | | | | * | | | refine code and add README | 2016-08-01 | |
| | | | | | | | | | | | |||
| | | | * | | | | | | | regenerated projects | 2016-08-01 | |
| | | | | | | | | | | | |||
| | * | | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into lr_july_16 | 2016-08-01 | |
| | |\ \ \ \ \ \ \ \ \ | |||
| | | | | * \ \ \ \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-08-01 | |
| | | | | |\ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | | | |||
| | | | | | | | | * | | | thrift serializer | 2016-07-31 | |
| | | | |_|_|_|_|/ / / | | | |/| | | | | | | | |||
* | | / | | | | | | | | Add c-ares in Makefile.template | 2016-07-28 | |
| |_|/ / / / / / / / |/| | | | | | | | | | |||
| | | | | | * | | | | Merge branch 'master' into move_timeout_encoding | 2016-07-26 | |
| | | | | | |\ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||
| | | | | | | | * | | Remove references to string_ref_helper | 2016-07-25 | |
| | | | | | | | | | | |||
| | | | | | | | * | | Merge remote-tracking branch 'upstream/master' into cli_main | 2016-07-25 | |
| | | | | | | | |\ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||
| * | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-07-25 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile | ||
| | | | | | | | * | | Remove unnecessary dependencies | 2016-07-25 | |
| | | | | | | | | | |