Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | 2016-09-08 | |
|\ | |||
* \ | Merge pull request #7774 from ctiller/percent-encoder | 2016-09-06 | |
|\ \ | |||
* \ \ | Merge pull request #7943 from markdroth/client_channel_cleanup | 2016-09-01 | |
|\ \ \ | |||
| * | | | Move subchannel_call_holder code into client_channel module. | 2016-08-31 | |
* | | | | add trace context proto | 2016-08-31 | |
|/ / / | |||
* | | | Merge pull request #7839 from markdroth/rename_client_config | 2016-08-29 | |
|\ \ \ | |||
| | | * | Revert change to grpc++_base uses section | 2016-08-29 | |
| | | * | build.yaml changes to make certain builds work | 2016-08-26 | |
| * | | | Rename grpc_client_config to grpc_resolver_result. | 2016-08-22 | |
| | | * | Rename some files to avoid conflicting .obj files on Windows | 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 | |
| |\ \ | |||
| | | * | Percent encoding routines | 2016-08-18 | |
| |_|/ |/| | | |||
| * | | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. | 2016-08-17 | |
| | * | Removing pre2 flag. | 2016-08-16 | |
| |/ | |||
* | | Merge pull request #6915 from markdroth/filter_api | 2016-08-05 | |
|\ \ | |||
* \ \ | 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 branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-08-01 | |
|\ \ \ \ \ | |||
| | | | | * | Bumping to 1.0.0-pre2. | 2016-07-29 | |
| | | * | | | Merge branch 'master' into move_timeout_encoding | 2016-07-26 | |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| | * | | | | merge to upstream/master | 2016-07-21 | |
| | |\ \ \ \ | |||
* | | \ \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-07-14 | |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | * | | | | | Added handshaker.[ch] to build.yaml. | 2016-07-14 | |
| |/ / / / / | |||
| | | * / / | Move timeout_encoding from core/ext/transport/chttp2 to core/lib/transport | 2016-07-13 | |
| | |/ / / | |/| | | | |||
| | | * | | Merge remote-tracking branch 'upstream/master' into filter_api | 2016-07-12 | |
| | | |\ \ | | |_|/ / | |/| | | | |||
| * | | | | Master is now 1.1.0-dev. | 2016-07-12 | |
| | |_|/ | |/| | | |||
| * | | | Flagging master as 1.0.0-pre1. | 2016-07-12 | |
| * | | | Merge remote-tracking branch 'upstream/master' into fix_mac_build | 2016-07-11 | |
| |\ \ \ | |||
| | * | | | another one | 2016-07-08 | |
| * | | | | Fix mac build | 2016-07-08 | |
| |/ / / | |||
| * | | | Added missing dependencies to grpc++_base | 2016-07-06 | |
| | | * | Merge branch 'filter_call_init_failure' into filter_api | 2016-07-01 | |
| | | |\ | | |_|/ | |/| | | |||
| | | * | Move channel_filter.h from include/ tree to src/ tree. | 2016-06-29 | |
| | | * | Merge branch 'filter_call_init_failure' into filter_api | 2016-06-29 | |
| | | |\ | |||
| * | | \ | Resolved merge conflicts with master | 2016-06-27 | |
| |\ \ \ \ | |||
| | * \ \ \ | Merge pull request #6973 from makdharma/network_status_change | 2016-06-27 | |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge pull request #6803 from sreecha/epoll_changes | 2016-06-25 | |
| | |\ \ \ \ \ | |||
| | * | | | | | | Update master branch to 0.16.0-dev | 2016-06-24 | |
| | | |_|_|_|/ | | |/| | | | | |||
| | | * | | | | Merge branch 'master' into epoll_changes_merged | 2016-06-21 | |
| | | |\ \ \ \ | | | |/ / / / | | |/| | | | | |||
* | | | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-06-20 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| | | | * | | | more files after running build.yaml changes through | 2016-06-20 | |
| | |_|/ / / | |/| | | | | |||
| | * | | | | Resolved merge conflicts with master | 2016-06-20 | |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| | | * | | | Merge branch 'master' into epoll_changes | 2016-06-16 | |
| | | |\ \ \ | |||
* | | | | | | | added missing grpclb.h dep in build.yaml | 2016-06-15 | |
* | | | | | | | gRPC LB policy | 2016-06-15 | |
| |_|_|/ / / |/| | | | | | |||
| | * | | | | Allow disabling traces, add trace variables for pluck and timeout events | 2016-06-15 | |
| |/ / / / |/| | | | |