Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into base | Yuchen Zeng | 2016-05-31 |
|\ | |||
| * | Merge github.com:grpc/grpc into test_affine | Craig Tiller | 2016-05-23 |
| |\ | |||
| * | | Remove legacy poller | Craig Tiller | 2016-05-20 |
| | * | Merge branch 'master' of github.com:grpc/grpc into credentials_refactoring | Julien Boeuf | 2016-05-18 |
| | |\ | | |/ | |/| | |||
| * | | Merge pull request #5456 from ctiller/cleaner-posix3 | Jan Tattermusch | 2016-05-13 |
| |\ \ | |||
| * \ \ | 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 #6279 from dgquintas/lb_proto_v1 | Jan Tattermusch | 2016-05-10 |
| |\ \ \ \ | |||
| * | | | | | Revert "cronet wrapper code" | Craig Tiller | 2016-05-09 |
| | | * | | | Resolve conflicts | Yuchen Zeng | 2016-05-06 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Merge pull request #6214 from makdharma/master | Nicolas Noble | 2016-05-05 |
| |\ \ \ \ \ | |||
| | | | | | * | Refactoring the core security code. | Julien Boeuf | 2016-05-04 |
| | * | | | | | Added all transitive header dependencies in build.yaml to fix the failing check. | Makarand Dharmapurikar | 2016-05-04 |
| | * | | | | | 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 codegen_remove_proto | David Garcia Quintas | 2016-05-02 |
| |\| | | | | |||
| | | | * | | Server builder plugin | Yuchen Zeng | 2016-04-29 |
| | | |/ / | | |/| | | |||
| | * | | | Merge pull request #6183 from nicolasnoble/msys-support | Jan Tattermusch | 2016-04-27 |
| | |\ \ \ | |||
| * | | | | | Moved protos out of core_codegen interface | David Garcia Quintas | 2016-04-27 |
| |/ / / / | |||
* / / / / | Change win32 file suffix | Yuchen Zeng | 2016-04-26 |
|/ / / / | |||
* | | | | Merge pull request #5445 from murgatroid99/node_protoc_plugin | Jan Tattermusch | 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 |
|\ \ \ \ | |||
| * | | | | Add various options to verify ssl/tls client cert including letting the | Deepak Lukose | 2016-04-19 |
| | * | | | Merged from master | murgatroid99 | 2016-04-19 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | | * | | 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 |
|/ / / | |||
* | | | Sort out codegen dependencies | Craig Tiller | 2016-04-07 |
* | | | Remove *_codegen_lib | Craig Tiller | 2016-04-07 |
| | * | 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 |
| |_|_|/ |/| | | | |||
* | | | | Move subchannel_call_holder | Craig Tiller | 2016-04-05 |
| | * | | Merge github.com:grpc/grpc into cleaner-posix3 | Craig Tiller | 2016-04-04 |
| | |\ \ | |||
* | | \ \ | Merge branch 'subchannel_factory_create_lb_channel' of github.com:dgquintas/g... | Craig Tiller | 2016-04-01 |
|\ \ \ \ \ | |||
| | | | | * | Merge branch 'master' of github.com:grpc/grpc into subchannel_factory_create_... | David Garcia Quintas | 2016-04-01 |
| | |_|_|/| | |/| | |/ | |||
| | | | * | Merge pull request #6042 from ctiller/optionalize_resolvers | Nicolas Noble | 2016-04-01 |
| | | | |\ | |||
* | | | | \ | Merge github.com:grpc/grpc into optionalize_client_config | Craig Tiller | 2016-04-01 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||
| | * | | | | Merge branch 'master' into subchannel_factory_create_lb_channel | David G. Quintas | 2016-04-01 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Merge pull request #5419 from ctiller/cleaner-posix2 | Nicolas Noble | 2016-04-01 |
| |\ \ \ \ \ | |||
* | \ \ \ \ \ | Merge branch 'optionalize_resolvers' into optionalize_client_config | Craig Tiller | 2016-04-01 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||
| * | | | | | | Zookeeper fixes | Craig Tiller | 2016-04-01 |
| * | | | | | | Tweak zookeeper | Craig Tiller | 2016-04-01 |
| * | | | | | | Merge branch 'optionalize_census' into optionalize_resolvers | Craig Tiller | 2016-04-01 |
| |\| | | | | |