Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into epoll_changes_merged | Sree Kuchibhotla | 2016-06-21 |
|\ | |||
| * | Merge pull request #6954 from dgquintas/protoc_include_path | Nicolas Noble | 2016-06-20 |
| |\ | |||
| * \ | Merge pull request #6352 from ctiller/error | Jan Tattermusch | 2016-06-17 |
| |\ \ | |||
| | | * | Added third_party/protobuf/src to protoc's include path | David Garcia Quintas | 2016-06-17 |
* | | | | Test polling island merges | Sree Kuchibhotla | 2016-06-16 |
* | | | | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-16 |
|\ \ \ \ | | |_|/ | |/| | | |||
| | * | | Keeping this up-to-date | Vijay Pai | 2016-06-16 |
| | * | | Merge branch 'master' into wheezy | Vijay Pai | 2016-06-15 |
| | |\ \ | | |/ / | |/| | | |||
| | | * | Merge branch 'idempotent_endpoint_shutdown' into handshake_timeout | Craig Tiller | 2016-06-15 |
| | | |\ | | |_|/ | |/| | | |||
| | * | | Exclude boringssl tests and libs from C++ build if EMBED_OPENSSL is | vjpai | 2016-06-15 |
| * | | | Merge pull request #6572 from y-zeng/base64_decode | Jan Tattermusch | 2016-06-14 |
| |\ \ \ | |||
* | | | | | Rename _GRPC_TSAN to GRPC_TSAN | Sree Kuchibhotla | 2016-06-13 |
* | | | | | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-13 |
|\| | | | | |||
* | | | | | Fix tsan failures | Sree Kuchibhotla | 2016-06-13 |
| * | | | | Merge pull request #6438 from y-zeng/reflection_separate_lib | Jan Tattermusch | 2016-06-13 |
| |\ \ \ \ | |||
| | | | | * | Add a test of connecting many times in a row | Craig Tiller | 2016-06-12 |
* | | | | | | 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 |
| | | | | |\| | | |||
| * | | | | | | | Factor out json seriailzation code and move it into parse_json. | David Klempner | 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 |
| | | * | | | | | add tests | 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 |
| | | | | | | | | * | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-06 |
| | | | | | | | | |\ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||
| | | * | | | | | | | Spliting filegroup. | yang-g | 2016-06-03 |
| | | * | | | | | | | merge and resolve conflicts | yang-g | 2016-06-03 |
| | | |\ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | |