Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-07-14 |
|\ | |||
| * | 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 |
| * | 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 |
| |/ / |/| | | |||
| * | | 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 pull request #6610 from xyzzyz/external_fd_fresh | 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' 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 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||
| * | | | | | | Merge branch 'master' of github.com:grpc/grpc into core_codegen_be_public | David Garcia Quintas | 2016-06-07 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||
| | | * | | | | Add C++ support for using external FD | Adam Michalik | 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 pull request #6190 from dgquintas/lb_pollset_propagation | Jan Tattermusch | 2016-06-07 |
| | |\ \ \ \ | |||
| | | | | * \ | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-07 |
| | | | | |\ \ | | | |_|_|/ / | | |/| | | | | |||
| | * | | | | | Merge pull request #6792 from yang-g/build_clean | Jan Tattermusch | 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 and resolve conflicts | yang-g | 2016-06-03 |
| | | | |\ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||
| | | | * | | | | | Make grpc++ independent of protobuf | yang-g | 2016-06-03 |
| | | | | | * | | | 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 |
| | |\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ | 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 |
| | | | | | | |\ \ | | | | |_|_|_|/ / | | | |/| | | | | |