Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #3027 from jboeuf/security_connector_refactoring | Craig Tiller | 2015-09-22 |
|\ | | | | | Security connector refactoring | ||
* \ | Merge branch 'master' of github.com:grpc/grpc into rr_with_registry | David Garcia Quintas | 2015-09-16 |
|\ \ | |||
| | * | Changing build.yaml: s/secure_tranport_setup/handshake | Julien Boeuf | 2015-09-15 |
| |/ | |||
| * | Merge pull request #3340 from grpc/release-0_11 | Eric Anderson | 2015-09-14 |
| |\ | | | | | | | Release 0.11 branch to master. | ||
| * \ | Merge pull request #3248 from dgquintas/lb_registry | Craig Tiller | 2015-09-11 |
| |\ \ | | | | | | | | | Introduced a registry for LB policies. | ||
| | | * | grpc++.h was not installed | Craig Tiller | 2015-09-11 |
| | |/ | |/| | |||
* | | | Usage of ?lb_policy=xxx in sockaddr_resolver | David Garcia Quintas | 2015-09-10 |
| | | | | | | | | | | | | Plus test tweaks and final touches to round robin policy | ||
* | | | Merge remote-tracking branch 'origin/uri_query_fragments' into rr_with_registry | David Garcia Quintas | 2015-09-08 |
|\| | | |||
* | | | Added round robin LB policy. | David Garcia Quintas | 2015-09-08 |
| |/ |/| | |||
* | | Introduced a registry for LB policies. | David Garcia Quintas | 2015-09-03 |
| | | |||
| * | Merge pull request #3183 from ctiller/second-coming | Nicolas Noble | 2015-09-02 |
| |\ | | | | | | | Refactor Endpoint API | ||
| * | | fix C# nuget package building | Jan Tattermusch | 2015-09-02 |
|/ / | |||
| * | get directories right | Craig Tiller | 2015-09-01 |
| | | |||
| * | Exclude some tests from Windows until we figure things out better | Craig Tiller | 2015-09-01 |
| | | |||
| * | Update generated code | Craig Tiller | 2015-09-01 |
| | | |||
| * | Merge branch 'third-coming' into endpoints | Craig Tiller | 2015-09-01 |
| |\ | |||
| * | | Use msbuild for tests | Craig Tiller | 2015-09-01 |
|/ / | |||
* | | Merge github.com:grpc/grpc into cleaner-build | Craig Tiller | 2015-08-31 |
|\ \ | |||
| * \ | Merge pull request #3107 from a-veitch/view_api | Hongyu Chen | 2015-08-31 |
| |\ \ | | | | | | | | | API for: defining view and aggregations, associating them with metrics, and retrieving data | ||
| | * | | change aggregation_ops to internal type | Alistair Veitch | 2015-08-31 |
| | | | | |||
| | | * | C tests dont need protobuf | Craig Tiller | 2015-08-31 |
| | | | | |||
| | | * | Merge branch 'cleaner-build' into third-coming | Craig Tiller | 2015-08-31 |
| | | |\ | |_|_|/ |/| | | | |||
| | | * | Merge github.com:grpc/grpc into second-coming | Craig Tiller | 2015-08-31 |
| | | |\ | | |_|/ | |/| | | |||
* / | | | Generated changes | Craig Tiller | 2015-08-31 |
|/ / / | |||
| * | | merge | Alistair Veitch | 2015-08-31 |
| |\ \ | |||
* | | | | Fixing headers and paths after merge with upstream. | Julien Boeuf | 2015-08-30 |
| | | | | |||
* | | | | Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processor | Julien Boeuf | 2015-08-30 |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | Merge branch 'master' into tracing_api | Alistair Veitch | 2015-08-28 |
| |\ \ \ | |||
| | | * \ | merge to head | Alistair Veitch | 2015-08-28 |
| | | |\ \ | | | |/ / | | |/| | | |||
* | | | | | Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processor | Julien Boeuf | 2015-08-27 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| | | * | | view and aggregation API | Alistair Veitch | 2015-08-27 |
| | | | | | |||
| * | | | | Merge pull request #2863 from jtattermusch/csharp_upgrade_to_proto3 | Michael Lumish | 2015-08-27 |
| |\ \ \ \ | | | | | | | | | | | | | Upgrade C# to proto3 | ||
| | | | | * | Add a portable test of endpoint pairs | Craig Tiller | 2015-08-27 |
| | |_|_|/ | |/| | | | |||
| | * | | | upgrade third_party/protobufs to 3.0.0-beta-1 | Jan Tattermusch | 2015-08-27 |
| | | | | | |||
* | | | | | Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processor | Julien Boeuf | 2015-08-26 |
|\ \ \ \ \ | |||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' into string_ref_auth | yang-g | 2015-08-26 |
| | |\ \ \ \ | |||
| | | | * \ \ | Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3 | Jan Tattermusch | 2015-08-26 |
| | | | |\ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | Conflicts: src/csharp/Grpc.IntegrationTesting/InteropClient.cs | ||
| | | * | | | | Merge pull request #3065 from yang-g/string_ref | Craig Tiller | 2015-08-26 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | Use string_ref for incoming metadata | ||
| | * | | | | | | auth context api change for string_ref | yang-g | 2015-08-25 |
| | | |/ / / / | | |/| | | | | |||
| | | * | | | | More merge conflict fix | Hongyu Chen | 2015-08-25 |
| | | | | | | | |||
| | | * | | | | Merge remote-tracking branch 'upstream/master' into timespec | Hongyu Chen | 2015-08-25 |
| | | |\ \ \ \ | |||
| | | | * \ \ \ | Merge pull request #3021 from ctiller/reject-the-stuffs | Yang Gao | 2015-08-25 |
| | | | |\ \ \ \ | | | | | |_|_|/ | | | | |/| | | | Outlaw illegal metadata characters | ||
| | | | | | | * | merge to head | Alistair Veitch | 2015-08-25 |
| | | | | | | |\ | | | | | |_|_|/ | | | | |/| | | | |||
| | | * | | | | | Merge remote-tracking branch 'upstream/master' into timespec | Hongyu Chen | 2015-08-25 |
| | | |\| | | | | |||
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into string_ref | yang-g | 2015-08-25 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||
| | | * | | | | | add missing headers from 2495 | yang-g | 2015-08-25 |
| | | | | | | | | |||
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into string_ref | yang-g | 2015-08-25 |
| | |\| | | | | | |||
| | * | | | | | | impl | yang-g | 2015-08-25 |
| |/ / / / / / | |||
| | * | | | | | Merge pull request #2945 from maxwell-demon/master | Alistair Veitch | 2015-08-25 |
| |/| | | | | | | | | | | | | | | | | | | | Re-install census_filters | ||
| * | | | | | | Merge branch 'master' of github.com:grpc/grpc into cpp_string_ref | Julien Boeuf | 2015-08-24 |
| |\ \ \ \ \ \ |