Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #6190 from dgquintas/lb_pollset_propagation | Jan Tattermusch | 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 |
| | |\ | |_|/ |/| | | |||
* | | | Merge pull request #6750 from makdharma/cronet | Jan Tattermusch | 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 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 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||
| | | | | * | | fixed dependency problem in grpc_cronet by adding dep on chttp2 | Makarand Dharmapurikar | 2016-06-01 |
| | | | | * | | incremental fix - removed cronet dependency from grpc_secure | Makarand Dharmapurikar | 2016-06-01 |
| | | | | * | | 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 |
| | |_|_|_|/ / | |/| | | | | | |||
| | | * | | | | Deprecate perf_db use | vjpai | 2016-05-31 |
| | |/ / / / | |/| | | | | |||
| | * | | | | fix options file; fix generated include guards | Alistair Veitch | 2016-05-26 |
| | * | | | | Merge branch 'master' into add_proto | Alistair Veitch | 2016-05-24 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Cleanup redundant tests | Craig Tiller | 2016-05-23 |
| * | | | | | Merge github.com:grpc/grpc into test_affine | Craig Tiller | 2016-05-23 |
| |\ \ \ \ \ | |||
| | | * | | | | end-to-end compilation | Alistair Veitch | 2016-05-23 |
| | * | | | | | Merge pull request #6423 from ctiller/signal_handler | Jan Tattermusch | 2016-05-22 |
| | |\ \ \ \ \ | |||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||
| | | | | * | | | Separate the grpc_cli targets into a separate library | yang-g | 2016-05-19 |
| | | * | | | | | Merge branch 'master' of github.com:grpc/grpc into credentials_refactoring | Julien Boeuf | 2016-05-18 |
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
| | | | | * | | | Add proto file support in grpc_cli | yang-g | 2016-05-18 |
| | |_|_|/ / / | |/| | | | | | |||
| | | | * | | | Merge github.com:grpc/grpc into signal_handler | Craig Tiller | 2016-05-18 |
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | |||
| | | | | | * | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation | David Garcia Quintas | 2016-05-18 |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | |||
| | * | | | | | Better testing | Craig Tiller | 2016-05-16 |
| |/ / / / / | |||
| * | | | | | Merge pull request #5456 from ctiller/cleaner-posix3 | Jan Tattermusch | 2016-05-13 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge pull request #6569 from yang-g/ubsan | Jan Tattermusch | 2016-05-13 |
| |\ \ \ \ \ \ | |||
| | * | | | | | | prepare to enable ubsan in continuous build | yang-g | 2016-05-12 |
| * | | | | | | | Merge pull request #6553 from grpc/revert-6488-revert-6214-master | Jan Tattermusch | 2016-05-12 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #6373 from y-zeng/server-builder-plugin | Yuchen Zeng | 2016-05-11 |
| |\ \ \ \ \ \ \ | |||
| | | * | | | | | | replaced header list with filegroup in build.yaml. | Makarand Dharmapurikar | 2016-05-11 |
| | | * | | | | | | 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 #6513 from ctiller/warnings | Nicolas Noble | 2016-05-10 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge pull request #6279 from dgquintas/lb_proto_v1 | Jan Tattermusch | 2016-05-10 |
| |\ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | Enable -Wextra-semi on compilers that support it | Craig Tiller | 2016-05-10 |
| | |/ / / / / / / | |/| | | | | | | | |||
| * | | | | | | | | Revert "cronet wrapper code" | Craig Tiller | 2016-05-09 |
| | | * | | | | | | Resolve conflicts | Yuchen Zeng | 2016-05-06 |
| | | |\ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||
| * | | | | | | | | Master is now 0.15.0-dev. | Nicolas "Pixel" Noble | 2016-05-06 |
| * | | | | | | | | Merge pull request #6214 from makdharma/master | Nicolas Noble | 2016-05-05 |
| |\ \ \ \ \ \ \ \ |