Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into grpc_trace_granularity | murgatroid99 | 2016-06-23 |
|\ | |||
| * | Merge pull request #6839 from dgquintas/simplify_compression_interop | Jan Tattermusch | 2016-06-21 |
| |\ | |||
| * | | Fix errored streams prematurely terminating, add a test | Craig Tiller | 2016-06-20 |
* | | | Resolved merge conflicts with master | murgatroid99 | 2016-06-20 |
|\| | | |||
| | * | Merge branch 'master' of github.com:grpc/grpc into simplify_compression_interop | David Garcia Quintas | 2016-06-17 |
| | |\ | | |/ | |/| | |||
| | * | Merge branch 'master' of github.com:grpc/grpc into simplify_compression_interop | David Garcia Quintas | 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 |
|\ \ \ | |||
* \ \ \ | 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 |
| | | | * | 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 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 |
| |_|_|_|/ / / |/| | | | | | | |||
| | | * | | | | Add filegroup grpc++_codegen_proto | Yuchen Zeng | 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 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| * | | | | | 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 |
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
| | | | | * | | | 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 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 |
| | | |\ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||
| | | * | | | | | | 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 pull request #6636 from yang-g/grpc_cli | Jan Tattermusch | 2016-06-03 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #6731 from vjpai/beheader | 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 |
| | | | | | | | | | |\ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||
| | * | | | | | | | | | Merge pull request #6702 from a-veitch/add_proto | Jan Tattermusch | 2016-06-01 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | * | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-01 |
| | | | | | | | | | | |\ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||
| | | | | | * | | | | | | Regenerate sources_and_headers.json | Yuchen Zeng | 2016-05-31 |
| | | | | | | * | | | | | s/grpc_pops/grpc_polling_entity | David Garcia Quintas | 2016-05-31 |
| | | | | | * | | | | | | Merge remote-tracking branch 'upstream/master' into base | Yuchen Zeng | 2016-05-31 |
| | | | | | |\ \ \ \ \ \ |