Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | PHP Proto3: run generate_projects.sh | 2016-09-29 | |
| | |||
* | Merge branch 'master' of https://github.com/grpc/grpc into ↵ | 2016-09-29 | |
|\ | | | | | | | master-upmerge-from-deep-under | ||
* \ | Merge remote-tracking branch 'google/v1.0.x' into master-upmerge-from-deep-under | 2016-09-29 | |
|\ \ | |||
| | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | 2016-09-23 | |
| | |\ | |_|/ |/| | | |||
* | | | Merge remote-tracking branch 'upstream/master' into http_connect | 2016-09-21 | |
|\ \ \ | |||
| | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | 2016-09-21 | |
| | | |\ | | |_|/ | |/| | | |||
| | * | | Backport of #8055 into v1.0.x. | 2016-09-20 | |
| | | | | |||
| * | | | Merge pull request #8052 from Vizerai/grpc_tracing | 2016-09-19 | |
| |\ \ \ | | | | | | | | | | | grpc tracing context | ||
| | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | 2016-09-19 | |
| | | | |\ | | |_|_|/ | |/| | | | |||
* | | | | | Merge remote-tracking branch 'upstream/master' into http_connect | 2016-09-16 | |
|\ \ \ \ \ | |||
| | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | 2016-09-16 | |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | * | | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | 2016-09-16 | |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Merge pull request #8069 from ↵ | 2016-09-16 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grpc/revert-8068-revert-7279-grand-unified-closures Revert "Revert "Grand unified closures"" | ||
* | | | | | | | Merge remote-tracking branch 'upstream/master' into http_connect | 2016-09-16 | |
|\| | | | | | | |||
| | | * | | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | 2016-09-16 | |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| * | | | | | | Merge pull request #7996 from yang-g/canonical | 2016-09-15 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add a helper to get canonical code from status | ||
| * \ \ \ \ \ \ | Merge pull request #7559 from dgquintas/codegen_cleanse | 2016-09-13 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Removed references to public APIs from codegen/ | ||
* | | | | | | | | | Merge remote-tracking branch 'upstream/master' into http_connect | 2016-09-13 | |
|\| | | | | | | | | |||
| | | | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | 2016-09-12 | |
| | | | | | | | |\ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||
| | | | * | | | | | Revert "Revert "Grand unified closures"" | 2016-09-12 | |
| | |_|/ / / / / | |/| | | | | | | |||
| * | | | | | | | Revert "Grand unified closures" | 2016-09-12 | |
| | | | | | | | | |||
| | | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | 2016-09-12 | |
| | | | | | | |\ | | |_|_|_|_|_|/ | |/| | | | | | | |||
| | | | | * | | | initial commit of tracing context files | 2016-09-09 | |
| | | | | | | | | |||
| | | * | | | | | Add a helper to get canonical code from status | 2016-09-09 | |
| | | | | | | | | |||
| | | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | 2016-09-09 | |
| | | | | | | |\ | | | | | | |_|/ | | | | | |/| | | |||
| * | | | | | | | Merge github.com:grpc/grpc into grand-unified-closures | 2016-09-08 | |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||
| | | | | * | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | 2016-09-08 | |
| | | | | |\ \ \ | | | |_|_|/ / / | | |/| | | | | | |||
| | * | | | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | 2016-09-08 | |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||
| | * | | | | | | Fix merge | 2016-09-07 | |
| | | | | | | | | |||
| | | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | 2016-09-07 | |
| | | | | | | |\ | | | |_|_|_|_|/ | | |/| | | | | | |||
* | | | | | | | | Merge remote-tracking branch 'upstream/master' into http_connect | 2016-09-07 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| | * | | | | | | Merge github.com:grpc/grpc into grand-unified-closures | 2016-09-07 | |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #7774 from ctiller/percent-encoder | 2016-09-06 | |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | Percent encoding routines | ||
* | | | | | | | | Merge remote-tracking branch 'upstream/master' into http_connect | 2016-09-06 | |
|\| | | | | | | | |||
| | | | | | * | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | 2016-09-06 | |
| | | | | | |\ \ | | |_|_|_|_|/ / | |/| | | | | | | |||
| | | * | | | | | Merge github.com:grpc/grpc into grand-unified-closures | 2016-09-02 | |
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
| | | | | * | | | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | 2016-09-02 | |
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||
| | | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | 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 branch 'master' of github.com:grpc/grpc into codegen_cleanse | 2016-09-01 | |
| | | | | | |\ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||
| | | | | | | | * | Merge branch 'client_channel_cleanup' into deadline_filter | 2016-09-01 | |
| | | | | | | | |\ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||
| | * | | | | | | | Move subchannel_call_holder code into client_channel module. | 2016-08-31 | |
| | | | | | | | | | |||
| * | | | | | | | | add trace context proto | 2016-08-31 | |
| |/ / / / / / / | |||
* | | | | | | | | Merge remote-tracking branch 'upstream/master' into http_connect | 2016-08-31 | |
|\| | | | | | | | |||
| | | * | | | | | Merge github.com:grpc/grpc into grand-unified-closures | 2016-08-30 | |
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
| | | | | * | | | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | 2016-08-30 | |
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #7839 from markdroth/rename_client_config | 2016-08-29 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Rename grpc_client_config to grpc_resolver_result. | ||
| | | | | * | | | | Revert change to grpc++_base uses section | 2016-08-29 | |
| | | | | | | | | | |||
| | | | | * | | | | build.yaml changes to make certain builds work | 2016-08-26 | |
| | | | | | | | | | |||
| | | | | | | * | | Re-run generate_projects.sh. | 2016-08-26 | |
| | | | | | | | | |