Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into grand-unified-closures | 2016-09-02 | |
|\ | |||
| * | Merge pull request #7943 from markdroth/client_channel_cleanup | 2016-09-01 | |
| |\ | |||
| * \ | Merge pull request #7936 from y-zeng/log_test | 2016-09-01 | |
| |\ \ | |||
| | | * | Move subchannel_call_holder code into client_channel module. | 2016-08-31 | |
| * | | | add trace context proto | 2016-08-31 | |
| | |/ | |/| | |||
* | | | Merge github.com:grpc/grpc into grand-unified-closures | 2016-08-30 | |
|\| | | |||
| | * | 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. | 2016-08-22 | |
| * | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | 2016-08-20 | |
| |\ \ | | |/ | |/| | |||
| | * | Bumping version to 1.0.1-pre1. | 2016-08-18 | |
| | * | Merge pull request #7745 from nicolasnoble/no-more-pre | 2016-08-18 | |
| | |\ | |||
| | * \ | Merge pull request #7752 from nicolasnoble/unsecure-should-be-unsecure | 2016-08-18 | |
| | |\ \ | |||
| * | \ \ | Merge pull request #7741 from nicolasnoble/manual-upmerge | 2016-08-18 | |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge pull request #7735 from y-zeng/cli_main_fork | 2016-08-17 | |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge pull request #7594 from chedeti/grpc-thrift-v2 | 2016-08-17 | |
| |\ \ \ \ \ \ | |||
| | | | | | * | | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. | 2016-08-17 | |
| | | | | | | * | Removing pre2 flag. | 2016-08-16 | |
| | | | | | |/ | |||
| | | | | * / | Update required protobuf version to v3.0.0 | 2016-08-15 | |
| | | | | |/ | |||
| | | | * / | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | 2016-08-16 | |
| | |_|/| | | |/| | |/ | |||
| | | * | | Add CliCredentials, config_grpc_cli.h | 2016-08-15 | |
| | | * | | Merge remote-tracking branch 'upstream/master' into cli_main_fork | 2016-08-15 | |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | | | * | Remove use of verify-install target in Makefile | 2016-08-10 | |
| | | | * | Remove warning about protobuf 3.0.0+ from the Makefile | 2016-08-10 | |
* | | | | | Merge github.com:grpc/grpc into grand-unified-closures | 2016-08-09 | |
|\| | | | | |||
| * | | | | Merge pull request #6915 from markdroth/filter_api | 2016-08-05 | |
| |\ \ \ \ | |||
* | | | | | | Merge github.com:grpc/grpc into grand-unified-closures | 2016-08-04 | |
|\| | | | | | |||
* | | | | | | generate projects | 2016-08-04 | |
* | | | | | | Merge github.com:grpc/grpc into grand-unified-closures | 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 | |
| |\ \ \ \ \ \ | |||
| | | | * \ \ \ | Merge remote-tracking branch 'upstream/master' into filter_api | 2016-08-02 | |
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #6774 from a-veitch/add_resource | 2016-08-02 | |
| |\ \ \ \ \ \ \ | |||
| | | | | * \ \ \ | 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 | |
| | | | |_|_|_|_|/ / / | | | |/| | | | | | | | |||
| | | | | | | | | | * | Bumping to 1.0.0-pre2. | 2016-07-29 | |
| | | | | | | * | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-07-27 | |
| | | | | | | |\ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | | | |||
| | | | | | * | | | | | Merge branch 'master' into move_timeout_encoding | 2016-07-26 | |
| | | | | | |\ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | | | |||
| | | * | | | | | | | | Merge pull request #7518 from nicolasnoble/plugins-should-compile | 2016-07-25 | |
| | | |\ \ \ \ \ \ \ \ | |||
| | | | | | | | | | * | | 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 | |
| | | | | | | | |\ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | |