Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #6885 from yang-g/import | Nicolas Noble | 2016-06-28 |
|\ | |||
* \ | Merge pull request #6920 from murgatroid99/grpc_trace_granularity | Jan Tattermusch | 2016-06-28 |
|\ \ | |||
| | * | Merge remote-tracking branch 'upstream/master' into import | yang-g | 2016-06-28 |
| | |\ | |_|/ |/| | | |||
| * | | Resolved merge conflicts with master | murgatroid99 | 2016-06-27 |
| |\ \ | |||
* | | | | Annotate error.c for timing, remove broken test | Craig Tiller | 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 grpc_trace_granularity | murgatroid99 | 2016-06-23 |
| | | |\ \ | |_|_|/ / |/| | | | | |||
| | | | * | Merge remote-tracking branch 'upstream/master' into import | yang-g | 2016-06-23 |
| | | | |\ | |_|_|_|/ |/| | | | | |||
| * | | | | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-23 |
| |\ \ \ \ | |/ / / / |/| | | | | |||
* | | | | | Merge pull request #6839 from dgquintas/simplify_compression_interop | Jan Tattermusch | 2016-06-21 |
|\ \ \ \ \ | |||
| | * \ \ \ | Merge branch 'master' into epoll_changes_merged | Sree Kuchibhotla | 2016-06-21 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||
| | | | | * | Merge branch 'master' into import | yang-g | 2016-06-21 |
| | | | | |\ | |_|_|_|_|/ |/| | | | | | |||
| | | * | | | more files after running build.yaml changes through | Makarand Dharmapurikar | 2016-06-20 |
| |_|/ / / |/| | | | | |||
| | | * | | Resolved merge conflicts with master | murgatroid99 | 2016-06-20 |
| | | |\ \ | |_|_|/ / |/| | | | | |||
* | | | | | Merge pull request #6957 from ctiller/cpu_cost | Jan Tattermusch | 2016-06-17 |
|\ \ \ \ \ | |||
| | * \ \ \ | Merge branch 'master' of github.com:grpc/grpc into simplify_compression_interop | David Garcia Quintas | 2016-06-17 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||
| * | | | | | Adjust cpu_cost of some tests to better reflect reality | Craig Tiller | 2016-06-17 |
| | | * | | | Test polling island merges | Sree Kuchibhotla | 2016-06-16 |
| | * | | | | Merge branch 'master' of github.com:grpc/grpc into simplify_compression_interop | David Garcia Quintas | 2016-06-16 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| | | * | | | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-16 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| | | | * | | 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 |
| |\ \ \ \ | |||
| | | | * | | 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 missing language tag | yang-g | 2016-06-13 |
| | |_|_|_|/ | |/| | | | | |||
* | | | | | | Add a test of connecting many times in a row | Craig Tiller | 2016-06-12 |
| | | | * | | Completed interop spec, as well as code for c++ | David Garcia Quintas | 2016-06-09 |
| | | * | | | 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 |
| | | | | | | |\ | | | | | | | |/ | | | | | | |/| | |||
| | | * | | | | | 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 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | |