Commit message (Expand) | Author | Age | |
---|---|---|---|
* | 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 |
| * | Merge pull request #3190 from ctiller/daisy-dukes | Yang Gao | 2015-09-03 |
| |\ | |||
* | | | Introduced a registry for LB policies. | David Garcia Quintas | 2015-09-03 |
| | * | Merge github.com:grpc/grpc into daisy-dukes | Craig Tiller | 2015-09-01 |
| | |\ | |_|/ |/| | | |||
| * | | Merge branch 'third-coming' into endpoints | 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 |
| |\ \ \ | |||
| | * | | | change aggregation_ops to internal type | Alistair Veitch | 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 |
| | | |\ \ | | |_|/ / | |/| | | | |||
* / | | | | Hand-written changes | Craig Tiller | 2015-08-31 |
|/ / / / | |||
| * | | | merge | Alistair Veitch | 2015-08-31 |
| |\ \ \ | |||
| | | | * | Merge github.com:grpc/grpc into daisy-dukes | Craig Tiller | 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 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Fix build | yang-g | 2015-08-27 |
* | | | | | | 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 |
| | | | * | | Add a portable test of endpoint pairs | Craig Tiller | 2015-08-27 |
| | |_|/ / | |/| | | | |||
| | | | * | Update projects | Craig Tiller | 2015-08-26 |
| | |_|/ | |/| | | |||
* | | | | 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 pull request #3065 from yang-g/string_ref | Craig Tiller | 2015-08-26 |
| | | |\ \ \ | |||
| | * | | | | | 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 |
| | | | |\ \ \ | | | | | |_|/ | | | | |/| | | |||
| | | | | | * | 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 |
| |/| | | | | |||
| * | | | | | Merge branch 'master' of github.com:grpc/grpc into cpp_string_ref | Julien Boeuf | 2015-08-24 |
| |\ \ \ \ \ | |||
| * | | | | | | Adding grpc::string_ref class. | Julien Boeuf | 2015-08-24 |
| | | | * | | | Move core/profiling/timers_preciseclock.h to core/support/ such that we | Hongyu Chen | 2015-08-24 |
| | * | | | | | Fix merge failures | yang-g | 2015-08-24 |
| | * | | | | | merge with head | yang-g | 2015-08-24 |
| | |\ \ \ \ \ | |||
| | | * \ \ \ \ | Merge branch 'master' into fray | Vijay Pai | 2015-08-24 |
| | | |\ \ \ \ \ | |||
| | | | * \ \ \ \ | Merge pull request #3019 from dgquintas/channel_args_compression | Yang Gao | 2015-08-24 |
| | | | |\ \ \ \ \ | |||
| | | | * | | | | | | Remove accidental dependency on zookeeper in shutdown_test | Craig Tiller | 2015-08-24 |
| | | | | |_|/ / / | | | | |/| | | | | |||
| | | * / | | | | | Eliminate public thread-pool interface | Vijay Pai | 2015-08-24 |
| | | |/ / / / / | |||
| | | | | | * | | Update projects | Craig Tiller | 2015-08-24 |
| | * | | | | | | split stream.h into sync_stream.h and async_stream.h | yang-g | 2015-08-21 |
| | * | | | | | | headers reorg | yang-g | 2015-08-21 |