Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 2016-08-20 |
|\ | |||
| * | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. | Nicolas "Pixel" Noble | 2016-08-17 |
* | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | Nicolas "Pixel" Noble | 2016-08-16 |
|\| | |||
* | | Merge pull request #7370 from rjshade/move_timeout_encoding | kpayson64 | 2016-08-02 |
|\ \ | |||
* \ \ | Merge pull request #6774 from a-veitch/add_resource | kpayson64 | 2016-08-02 |
|\ \ \ | |||
* \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-08-01 |
|\ \ \ \ | |||
| | | | * | Update ruby google-protobuf dependency to 3.0 | murgatroid99 | 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 |
| | |/ | |/| | |||
| * | | Resolved merge conflicts with master | murgatroid99 | 2016-06-27 |
| |\ \ | |||
| | * \ | Merge pull request #6973 from makdharma/network_status_change | Jan Tattermusch | 2016-06-27 |
| | |\ \ | |||
| | * \ \ | 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 |
| |/ / / |/| | | | |||
| * | | | Merge branch 'idempotent_endpoint_shutdown' into handshake_timeout | Craig Tiller | 2016-06-15 |
| |\ \ \ | |/ / / |/| | | | |||
* | | | | Merge remote-tracking branch 'upstream/master' into base64_decode | Yuchen Zeng | 2016-06-09 |
|\ \ \ \ | |||
| | | * \ | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-09 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | * | | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-09 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge pull request #6481 from dgquintas/compression_md_level_bis | Jan Tattermusch | 2016-06-08 |
| |\ \ \ \ | |||
* | \ \ \ \ | Merge remote-tracking branch 'upstream/master' into base64_decode | Yuchen Zeng | 2016-06-08 |
|\ \ \ \ \ \ | |||
| | | | | * \ | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-08 |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | |||
| | | * | | | | Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis | David Garcia Quintas | 2016-06-07 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | * | | | | | implement support for adding external fd to server | Adam Michalik | 2016-06-07 |
| | * | | | | | separate posix functionality to grpc_posix.h | Adam Michalik | 2016-06-07 |
| |/ / / / / | |||
| | | * | | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-07 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| | | * | | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-07 |
| | | |\ \ \ | |||
| | | | | | * | merge to master | Alistair Veitch | 2016-06-07 |
| | | | | | |\ | | | | | |_|/ | | | | |/| | | |||
| * | | | | | | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation | David Garcia Quintas | 2016-06-06 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||
| | * | | | | | Merge pull request #6750 from makdharma/cronet | Jan Tattermusch | 2016-06-06 |
| | |\ \ \ \ \ | |||
| | | | | | * \ | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-06 |
| | | | | | |\ \ | | | |_|_|_|/ / | | |/| | | | | | |||
| | | | | | * | | Remove unused files | Sree Kuchibhotla | 2016-06-06 |
| | | | | * | | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-06 |
| | | | | |\ \ \ | | | |_|_|/ / / | | |/| | | | | | |||
| | | | * | | | | Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis | David Garcia Quintas | 2016-06-03 |
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||
| | * | | | | | | Merge pull request #6306 from y-zeng/win32_suffix | Jan Tattermusch | 2016-06-03 |
| | |\ \ \ \ \ \ | |||
| | | | | | | | * | initial implementation of resource handling | Alistair Veitch | 2016-06-02 |
| | * | | | | | | | Merge branch 'master' of github.com:grpc/grpc into lr_hook | David Garcia Quintas | 2016-06-02 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||
| | | | | * | | | | incremental fix - removed cronet dependency from grpc_secure | Makarand Dharmapurikar | 2016-06-01 |
| | | | | * | | | | cronet build related changes | Makarand Dharmapurikar | 2016-06-01 |
| | | | |/ / / / | | | |/| | | | | |||
| | | | | | * | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-01 |
| | | | | | |\ \ | | | | |_|_|/ / | | | |/| | | | | |||
| | | * | | | | | Merge pull request #6702 from a-veitch/add_proto | Jan Tattermusch | 2016-06-01 |
| | | |\ \ \ \ \ | |||
| | | | | | | * \ | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-01 |
| | | | | | | |\ \ | | | | |_|_|_|/ / | | | |/| | | | | | |||
| * | | | | | | | | s/grpc_pops/grpc_polling_entity | David Garcia Quintas | 2016-05-31 |