Commit message (Expand) | Author | Age | |
---|---|---|---|
* | 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 lb_pollset_propagation | David Garcia Quintas | 2016-06-06 |
| |\ | |||
| | * | Merge pull request #6750 from makdharma/cronet | Jan Tattermusch | 2016-06-06 |
| | |\ | |||
* | | \ | 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 branch 'master' of github.com:grpc/grpc into lr_hook | David Garcia Quintas | 2016-06-02 |
| |\ \ \ \ | |||
| | | | | * | cronet build related changes | Makarand Dharmapurikar | 2016-06-01 |
| | | |_|/ | | |/| | | |||
| | * | | | Merge pull request #6702 from a-veitch/add_proto | Jan Tattermusch | 2016-06-01 |
| | |\ \ \ | |||
| | | | | * | 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 |
| | | | |\ \ | |||
| | | | | | * | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation | David Garcia Quintas | 2016-05-31 |
| | | | | | |\ | | | | | | |/ | | | | | |/| | |||
| | * | | / | | Revert "Remove legacy poller" | Craig Tiller | 2016-05-31 |
| | | |_|/ / | | |/| | | | |||
| | | * | | | Merge branch 'master' into add_proto | Alistair Veitch | 2016-05-24 |
| | | |\ \ \ | | | |/ / / | | |/| | | | |||
| | * | | | | Merge github.com:grpc/grpc into test_affine | Craig Tiller | 2016-05-23 |
| | |\ \ \ \ | |||
| | | | * | | | end-to-end compilation | Alistair Veitch | 2016-05-23 |
| | * | | | | | Remove legacy poller | Craig Tiller | 2016-05-20 |
| | | |/ / / | | |/| | | | |||
| * | | | | | Merge branch 'master' of github.com:grpc/grpc into lr_hook | David Garcia Quintas | 2016-05-19 |
| |\| | | | | |||
| | | * | | | Merge branch 'master' of github.com:grpc/grpc into credentials_refactoring | Julien Boeuf | 2016-05-18 |
| | | |\ \ \ | | | |/ / / | | |/| | | | |||
* | / | | | | Merge branch 'compression_incoming_checks' into compression_md_level_bis | David Garcia Quintas | 2016-05-18 |
| |/ / / / |/| | | | | |||
| | | | * | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation | David Garcia Quintas | 2016-05-18 |
| | | | |\ | |_|_|_|/ |/| | | | | |||
* | | | | | Merge pull request #5456 from ctiller/cleaner-posix3 | Jan Tattermusch | 2016-05-13 |
|\ \ \ \ \ | |||
* | | | | | | Revert "Revert "cronet wrapper code"" | makdharma | 2016-05-11 |
| * | | | | | Merge github.com:grpc/grpc into cleaner-posix3 | Craig Tiller | 2016-05-11 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||
| | | * | | | Merge branch 'master' of https://github.com/grpc/grpc into credentials_refact... | Julien Boeuf | 2016-05-10 |
| | | |\ \ \ | |_|_|/ / / |/| | | | | | |||
* | | | | | | Merge pull request #6279 from dgquintas/lb_proto_v1 | Jan Tattermusch | 2016-05-10 |
|\ \ \ \ \ \ | |||
* | | | | | | | Revert "cronet wrapper code" | Craig Tiller | 2016-05-09 |
| | | | * | | | Refactoring the core security code. | Julien Boeuf | 2016-05-04 |
| | | | | | * | Introduced grpc_pops (pollset or pollset_set) | David Garcia Quintas | 2016-05-03 |
* | | | | | | | Added dummy cronet api implementation so we can build on Jenkins. | Makarand Dharmapurikar | 2016-05-03 |
| |_|_|/ / / |/| | | | | | |||
| | | * | | | Merge branch 'master' of github.com:grpc/grpc into lr_hook | David Garcia Quintas | 2016-04-29 |
| | | |\ \ \ | |_|_|/ / / |/| | | | | | |||
| | | * | | | all good! missing end2end test for new lr filter | David Garcia Quintas | 2016-04-29 |
| | | | | * | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation | David Garcia Quintas | 2016-04-27 |
| | | | | |\ | |_|_|_|_|/ |/| | | | | | |||
| | | | | * | Smarter pollset/pollset_set propagation | David Garcia Quintas | 2016-04-27 |
* | | | | | | Merge pull request #6183 from nicolasnoble/msys-support | Jan Tattermusch | 2016-04-27 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||
| | | | * | | Merge branch 'master' of github.com:grpc/grpc into lr_hook | David Garcia Quintas | 2016-04-27 |
| | | | |\ \ | |_|_|_|/ / |/| | | | | | |||
| | | | | * | Change win32 file suffix | Yuchen Zeng | 2016-04-26 |
| |_|_|_|/ |/| | | | | |||
| | * | | | Updated load balancer proto to v1 | David Garcia Quintas | 2016-04-25 |
| |/ / / |/| | | | |||
* | | | | Merge github.com:grpc/grpc into strong-includes | Craig Tiller | 2016-04-21 |
|\ \ \ \ | |||
| * | | | | Update boringssl to latest chromium-stable. | itessier | 2016-04-20 |
| | * | | | Adding support for msys. | Nicolas "Pixel" Noble | 2016-04-15 |
* | | | | | Rollup of changes from the latest import | Craig Tiller | 2016-04-11 |
| |/ / / |/| | | | |||
| * | | | Factored out parse functions from sockaddr_resolver | David Garcia Quintas | 2016-04-08 |
|/ / / | |||
| | * | Merge branch 'master' of github.com:grpc/grpc into lr_hook | David Garcia Quintas | 2016-04-07 |
| | |\ | |_|/ |/| | | |||
* | | | Sort out codegen dependencies | Craig Tiller | 2016-04-07 |
| | * | Load Reporting hook and filter skeleton | David Garcia Quintas | 2016-04-06 |
| * | | Merge github.com:grpc/grpc into cleaner-posix3 | Craig Tiller | 2016-04-06 |
| |\| | |||
| * | | Merge github.com:grpc/grpc into cleaner-posix3 | Craig Tiller | 2016-04-06 |
| |\ \ | |||
* | | | | Fixing client_config init | Craig Tiller | 2016-04-05 |
* | | | | Nailing down dependencies better | Craig Tiller | 2016-04-05 |
* | | | | Getting dependencies fixed up | Craig Tiller | 2016-04-05 |
| |_|/ |/| | |