Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | Nicolas "Pixel" Noble | 2016-09-08 |
|\ | |||
* \ | Merge pull request #7774 from ctiller/percent-encoder | Craig Tiller | 2016-09-06 |
|\ \ | |||
* \ \ | Merge pull request #7943 from markdroth/client_channel_cleanup | Mark D. Roth | 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 pull request #7839 from markdroth/rename_client_config | Mark D. Roth | 2016-08-29 |
|\ \ \ | |||
| | | * | Revert change to grpc++_base uses section | murgatroid99 | 2016-08-29 |
| | | * | build.yaml changes to make certain builds work | murgatroid99 | 2016-08-26 |
| * | | | 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 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||
| * | | 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 |
| |\ \ | |||
| | | * | Percent encoding routines | Craig Tiller | 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 pull request #6915 from markdroth/filter_api | kpayson64 | 2016-08-05 |
|\ \ | |||
* \ \ | 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 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 |
| | | * | | | Merge branch 'master' into move_timeout_encoding | Robbie Shade | 2016-07-26 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| | * | | | | merge to upstream/master | Alistair Veitch | 2016-07-21 |
| | |\ \ \ \ | |||
* | | \ \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-07-14 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | * | | | | | Added handshaker.[ch] to build.yaml. | Mark D. Roth | 2016-07-14 |
| |/ / / / / | |||
| | | * / / | Move timeout_encoding from core/ext/transport/chttp2 to core/lib/transport | Robbie Shade | 2016-07-13 |
| | |/ / / | |/| | | | |||
| | | * | | Merge remote-tracking branch 'upstream/master' into filter_api | Mark D. Roth | 2016-07-12 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| * | | | | Master is now 1.1.0-dev. | Nicolas "Pixel" Noble | 2016-07-12 |
| | |_|/ | |/| | | |||
| * | | | Flagging master as 1.0.0-pre1. | Nicolas "Pixel" Noble | 2016-07-12 |
| * | | | Merge remote-tracking branch 'upstream/master' into fix_mac_build | Yuchen Zeng | 2016-07-11 |
| |\ \ \ | |||
| | * | | | another one | yang-g | 2016-07-08 |
| * | | | | Fix mac build | Yuchen Zeng | 2016-07-08 |
| |/ / / | |||
| * | | | Added missing dependencies to grpc++_base | David Garcia Quintas | 2016-07-06 |
| | | * | Merge branch 'filter_call_init_failure' into filter_api | Mark D. Roth | 2016-07-01 |
| | | |\ | | |_|/ | |/| | | |||
| | | * | Move channel_filter.h from include/ tree to src/ tree. | Mark D. Roth | 2016-06-29 |
| | | * | Merge branch 'filter_call_init_failure' into filter_api | Mark D. Roth | 2016-06-29 |
| | | |\ | |||
| * | | \ | Resolved merge conflicts with master | murgatroid99 | 2016-06-27 |
| |\ \ \ \ | |||
| | * \ \ \ | Merge pull request #6973 from makdharma/network_status_change | Jan Tattermusch | 2016-06-27 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge pull request #6803 from sreecha/epoll_changes | Craig Tiller | 2016-06-25 |
| | |\ \ \ \ \ | |||
| | * | | | | | | Update master branch to 0.16.0-dev | murgatroid99 | 2016-06-24 |
| | | |_|_|_|/ | | |/| | | | | |||
| | | * | | | | Merge branch 'master' into epoll_changes_merged | Sree Kuchibhotla | 2016-06-21 |
| | | |\ \ \ \ | | | |/ / / / | | |/| | | | | |||
* | | | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-06-20 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| | | | * | | | more files after running build.yaml changes through | Makarand Dharmapurikar | 2016-06-20 |
| | |_|/ / / | |/| | | | | |||
| | * | | | | Resolved merge conflicts with master | murgatroid99 | 2016-06-20 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| | | * | | | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-16 |
| | | |\ \ \ | |||
* | | | | | | | added missing grpclb.h dep in build.yaml | David Garcia Quintas | 2016-06-15 |
* | | | | | | | gRPC LB policy | David Garcia Quintas | 2016-06-15 |
| |_|_|/ / / |/| | | | | | |||
| | * | | | | Allow disabling traces, add trace variables for pluck and timeout events | murgatroid99 | 2016-06-15 |
| |/ / / / |/| | | | |