Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #6920 from murgatroid99/grpc_trace_granularity | 2016-06-28 | |
|\ | |||
| * | Resolved merge conflicts with master | 2016-06-27 | |
| |\ | |||
* | | | Annotate error.c for timing, remove broken test | 2016-06-27 | |
| |/ |/| | |||
* | | Merge pull request #6973 from makdharma/network_status_change | 2016-06-27 | |
|\ \ | |||
| | * | Merge branch 'master' into grpc_trace_granularity | 2016-06-23 | |
| | |\ | |||
* | | \ | Merge branch 'master' into epoll_changes | 2016-06-23 | |
|\ \ \ \ | | |_|/ | |/| | | |||
| * | | | Merge pull request #6839 from dgquintas/simplify_compression_interop | 2016-06-21 | |
| |\ \ \ | |||
* | \ \ \ | Merge branch 'master' into epoll_changes_merged | 2016-06-21 | |
|\ \ \ \ \ | |||
| | | | * | | more files after running build.yaml changes through | 2016-06-20 | |
| | |_|/ / | |/| | | | |||
| | * | | | Fix errored streams prematurely terminating, add a test | 2016-06-20 | |
| |/ / / | |||
| | | * | Resolved merge conflicts with master | 2016-06-20 | |
| | | |\ | | |_|/ | |/| | | |||
| | * | | Merge branch 'master' of github.com:grpc/grpc into simplify_compression_interop | 2016-06-17 | |
| | |\ \ | | |/ / | |/| | | |||
| | * | | Merge branch 'master' of github.com:grpc/grpc into simplify_compression_interop | 2016-06-16 | |
| | |\ \ | |||
* | | \ \ | Merge branch 'master' into epoll_changes | 2016-06-16 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||
| | | | * | Allow disabling traces, add trace variables for pluck and timeout events | 2016-06-15 | |
| | |_|/ | |/| | | |||
| | * | | Merge branch 'idempotent_endpoint_shutdown' into handshake_timeout | 2016-06-15 | |
| | |\ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #6572 from y-zeng/base64_decode | 2016-06-14 | |
| |\ \ \ | |||
* | | | | | Merge branch 'master' into epoll_changes | 2016-06-13 | |
|\| | | | | |||
| * | | | | Merge pull request #6438 from y-zeng/reflection_separate_lib | 2016-06-13 | |
| |\ \ \ \ | |||
| | | | * | | Add a test of connecting many times in a row | 2016-06-12 | |
| | | | | * | Completed interop spec, as well as code for c++ | 2016-06-09 | |
| | | * | | | Merge remote-tracking branch 'upstream/master' into base64_decode | 2016-06-09 | |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
* | | | | | | Merge branch 'master' into epoll_changes | 2016-06-09 | |
|\| | | | | | |||
| | | | * | | Merge github.com:grpc/grpc into error | 2016-06-09 | |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
| * | | | | | Merge pull request #6481 from dgquintas/compression_md_level_bis | 2016-06-08 | |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge pull request #6610 from xyzzyz/external_fd_fresh | 2016-06-08 | |
| |\ \ \ \ \ \ | |||
| | | | | * \ \ | Merge remote-tracking branch 'upstream/master' into base64_decode | 2016-06-08 | |
| | | | | |\ \ \ | |||
| * | | | | | | | | Factor out json seriailzation code and move it into parse_json. | 2016-06-08 | |
| | |_|_|_|/ / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'master' into epoll_changes | 2016-06-08 | |
|\| | | | | | | | |||
| | | | * | | | | Add filegroup grpc++_codegen_proto | 2016-06-08 | |
* | | | | | | | | Merge branch 'master' into epoll_changes | 2016-06-08 | |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||
| | | | * | | | | Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis | 2016-06-07 | |
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||
| | * | | | | | | Merge branch 'master' of github.com:grpc/grpc into core_codegen_be_public | 2016-06-07 | |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| | | * | | | | | Add C++ support for using external FD | 2016-06-07 | |
| | | * | | | | | implement support for adding external fd to server | 2016-06-07 | |
| | | * | | | | | separate posix functionality to grpc_posix.h | 2016-06-07 | |
| | |/ / / / / | |/| | | | | | |||
| | | | * | | | Merge remote-tracking branch 'upstream/master' into reflection_separate_lib | 2016-06-07 | |
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | |||
| | | | * | | | Use deps instead of uses in build.yaml | 2016-06-07 | |
| | | | | | * | Merge github.com:grpc/grpc into error | 2016-06-07 | |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | |||
| * | | | | | | Merge pull request #6190 from dgquintas/lb_pollset_propagation | 2016-06-07 | |
| |\ \ \ \ \ \ | |||
| | | | | | | * | Merge github.com:grpc/grpc into error | 2016-06-07 | |
| | | | | | | |\ | | |_|_|_|_|_|/ | |/| | | | | | | |||
| * | | | | | | | Merge pull request #6792 from yang-g/build_clean | 2016-06-07 | |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge github.com:grpc/grpc into c++-is-people-too | 2016-06-06 | |
| |\ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation | 2016-06-06 | |
| | | | |\ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||
| | | | | | | * | | | Move reflection src/hdr to src/cpp/ext include/grpc++/ext | 2016-06-06 | |
| | * | | | | | | | | Merge pull request #6750 from makdharma/cronet | 2016-06-06 | |
| | |\ \ \ \ \ \ \ \ | |||
* | | \ \ \ \ \ \ \ \ | Merge branch 'master' into epoll_changes | 2016-06-06 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||
* | | | | | | | | | | | Remove unused files | 2016-06-06 | |
| | | | | | | | | | * | Merge github.com:grpc/grpc into error | 2016-06-06 | |
| | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||
| | * | | | | | | | | | Merge github.com:grpc/grpc into c++-is-people-too | 2016-06-06 | |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | |