Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | Mark D. Roth | 2016-09-16 |
|\ | |||
| * | Merge pull request #8069 from ↵ | Craig Tiller | 2016-09-16 |
| |\ | | | | | | | | | | | | | grpc/revert-8068-revert-7279-grand-unified-closures Revert "Revert "Grand unified closures"" | ||
* | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | Mark D. Roth | 2016-09-16 |
|\| | | |||
| * | | Merge pull request #7996 from yang-g/canonical | Yang Gao | 2016-09-15 |
| |\ \ | | | | | | | | | Add a helper to get canonical code from status | ||
| * \ \ | Merge pull request #7559 from dgquintas/codegen_cleanse | Craig Tiller | 2016-09-13 |
| |\ \ \ | | | | | | | | | | | Removed references to public APIs from codegen/ | ||
| | | | * | Revert "Revert "Grand unified closures"" | Craig Tiller | 2016-09-12 |
| | |_|/ | |/| | | |||
| * | | | Revert "Grand unified closures" | Craig Tiller | 2016-09-12 |
| | | | | |||
| | | * | Add a helper to get canonical code from status | yang-g | 2016-09-09 |
| | | | | |||
| * | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-09-08 |
| |\ \ \ | |||
* | \ \ \ | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | Mark D. Roth | 2016-09-08 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | Nicolas "Pixel" Noble | 2016-09-08 |
| |\ \ \ \ | |||
| * | | | | | Fix merge | Craig Tiller | 2016-09-07 |
| | | | | | | |||
| | | * | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-09-07 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Merge pull request #7774 from ctiller/percent-encoder | Craig Tiller | 2016-09-06 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Percent encoding routines | ||
* | | | | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | Mark D. Roth | 2016-09-06 |
|\| | | | | | |||
| | | | * | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-09-02 |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
| | | | | * | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-09-02 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| * | | | | | Merge pull request #7943 from markdroth/client_channel_cleanup | Mark D. Roth | 2016-09-01 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Move subchannel_call_holder code into client_channel module. | ||
| | | | | | * | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-09-01 |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | |||
| | * | | | | | Move subchannel_call_holder code into client_channel module. | Mark D. Roth | 2016-08-31 |
| | | | | | | | |||
| * | | | | | | add trace context proto | Alistair Veitch | 2016-08-31 |
| |/ / / / / | |||
| | | | * | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-08-30 |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
| | | | | * | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-08-30 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| * | | | | | Merge pull request #7839 from markdroth/rename_client_config | Mark D. Roth | 2016-08-29 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Rename grpc_client_config to grpc_resolver_result. | ||
| | | | * | | | Revert change to grpc++_base uses section | murgatroid99 | 2016-08-29 |
| | | | | | | | |||
| | | | * | | | build.yaml changes to make certain builds work | murgatroid99 | 2016-08-26 |
| | | | | | | | |||
* | | | | | | | Re-run generate_projects.sh. | Mark D. Roth | 2016-08-26 |
| | | | | | | | |||
* | | | | | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | Mark D. Roth | 2016-08-25 |
|\| | | | | | | |||
* | | | | | | | Add channel arg for max send message size and add message size filter. | Mark D. Roth | 2016-08-23 |
| |/ / / / / |/| | | | | | |||
* | | | | | | Rename grpc_client_config to grpc_resolver_result. | Mark D. Roth | 2016-08-22 |
| | | | | | | |||
| | | * | | | Rename some files to avoid conflicting .obj files on Windows | Craig Tiller | 2016-08-22 |
| | | | | | | |||
| * | | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 2016-08-20 |
|/| | | | | | | |/ / / | |/| | | | |||
* | | | | | Generating project file. | Nicolas "Pixel" Noble | 2016-08-18 |
| | | | | | |||
| * | | | | 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 |
| |\ \ \ \ | | | | | | | | | | | | | Removing pre2 flag. | ||
| | | * | | | Add a strict and a permissive decoder, allow different reserved alphabets | Craig Tiller | 2016-08-18 |
| | | | | | | |||
| | | * | | | Percent encoding routines | Craig Tiller | 2016-08-18 |
| | | | | | | |||
* | | | | | | Fix CMake for Windows | Arkadiy Shapkin | 2016-08-18 |
| |_|/ / / |/| | | | | |||
| * | | | | 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 |
| |/ / / | |||
| | * | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-08-09 |
| | |\ \ | |_|/ / |/| | | | |||
* | | | | Merge pull request #6915 from markdroth/filter_api | kpayson64 | 2016-08-05 |
|\ \ \ \ | | | | | | | | | | | Implement C++ API for defining channel filters. | ||
| | | * \ | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-08-04 |
| | | |\ \ | |_|_|/ / |/| | | | | |||
* | | | | | Merge pull request #7370 from rjshade/move_timeout_encoding | kpayson64 | 2016-08-02 |
|\ \ \ \ \ | | | | | | | | | | | | | Move timeout_encoding to core/lib/transport | ||
| | * \ \ \ | 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 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add Census resource API and implementation. | ||
| | | | | | * | regenerated projects for the umpth time after merge | David Garcia Quintas | 2016-08-02 |
| |_|_|_|_|/ |/| | | | | | |||
| | | * | | | Ran generate_projects.sh. | Mark D. Roth | 2016-08-02 |
| |_|/ / / |/| | | | | |||
* | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-08-01 |
|\ \ \ \ \ | |||
| | | | * | | Bumping to 1.0.0-pre2. | Nicolas "Pixel" Noble | 2016-07-29 |
| | | | | | |