Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-08-01 |
|\ | |||
* \ | 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 |
| |/ | |||
| * | Fix mac build | Yuchen Zeng | 2016-07-08 |
| * | Added missing dependencies to grpc++_base | David Garcia Quintas | 2016-07-06 |
| * | Merge remote-tracking branch 'google/master' into contrib-cmake | Nicolas "Pixel" Noble | 2016-07-02 |
| |\ | |||
| | * | 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 |
| | | |\ \ | |||
| * | | | | | Remove an unneccessary dependency from grpc++_base | Tamas Berghammer | 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 pull request #6572 from y-zeng/base64_decode | Jan Tattermusch | 2016-06-14 |
|\ \ \ | |||
| | | * | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-13 |
| | | |\ | |_|_|/ |/| | | | |||
* | | | | Merge pull request #6438 from y-zeng/reflection_separate_lib | Jan Tattermusch | 2016-06-13 |
|\ \ \ \ | |||
| | | | * | generate_projects.sh after adding grpc_use_signal() API | Sree Kuchibhotla | 2016-06-10 |
| | * | | | 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 |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | |||
| | | * | | | | Add filegroup grpc++_codegen_proto | Yuchen Zeng | 2016-06-08 |
| | | | | | * | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-08 |
| | | | | | |\ | |||
| | * | | | | | | regenerated projects | David Garcia Quintas | 2016-06-07 |
| | * | | | | | | 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 remote-tracking branch 'upstream/master' into reflection_separate_lib | Yuchen Zeng | 2016-06-07 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | | * | | | | Use deps instead of uses in build.yaml | Yuchen Zeng | 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 |
| |\ \ \ \ \ \ \ | |||
| | | * | | | | | | regenerated projects | David Garcia Quintas | 2016-06-06 |
| | | * | | | | | | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation | David Garcia Quintas | 2016-06-06 |
| | | |\ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||
| * | | | | | | | | regenerate projects to fix master | Jan Tattermusch | 2016-06-06 |
| | | | | * | | | | Move reflection src/hdr to src/cpp/ext include/grpc++/ext | Yuchen Zeng | 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 |