Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #3476 from vjpai/block_annotate | Yang Gao | 2015-09-25 |
|\ | | | | | Annotate blocking points | ||
| * | Move block_annotate from iomgr to support since it's used in other | vjpai | 2015-09-24 |
| | | | | | | | | core places besides iomgr | ||
| * | Rebuild all project files with new header included | Vijay Pai | 2015-09-24 |
| | | |||
* | | Final patches for rename | Craig Tiller | 2015-09-22 |
| | | |||
* | | Split closures from iomgr.h | Craig Tiller | 2015-09-22 |
| | | |||
* | | Merge github.com:grpc/grpc into we-are-one | Craig Tiller | 2015-09-22 |
|\| | |||
| * | Merge pull request #3027 from jboeuf/security_connector_refactoring | Craig Tiller | 2015-09-22 |
| |\ | | | | | | | Security connector refactoring | ||
* | | | Fixes | Craig Tiller | 2015-09-21 |
| | | | |||
| * | | Merge branch 'master' of github.com:grpc/grpc into rr_with_registry | David Garcia Quintas | 2015-09-16 |
| |\ \ | |||
| | | * | Merge branch 'master' of github.com:grpc/grpc into ↵ | Julien Boeuf | 2015-09-15 |
| | | |\ | | | |/ | | |/| | | | | | security_connector_refactoring | ||
* | | | | Merge github.com:grpc/grpc into shindig | Craig Tiller | 2015-09-15 |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #3340 from grpc/release-0_11 | Eric Anderson | 2015-09-14 |
| |\ \ \ | | | | | | | | | | | Release 0.11 branch to master. | ||
* | | | | | Merge github.com:grpc/grpc into shindig | Craig Tiller | 2015-09-11 |
|\| | | | | |||
| * | | | | 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 |
| | |/ / / | |/| | | | |||
* / | | | | Workqueue: interface, test, and posix implementation | Craig Tiller | 2015-09-09 |
|/ / / / | |||
| | * | | 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 |
|\ \ \ | | | | | | | | | Fix flow control issues | ||
| | * | | 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 |
| |\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.json vsprojects/Grpc.mak | ||
* | | | | 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 |
| |\ \ \ \ | | | | | | | | | | | | | API for: defining view and aggregations, associating them with metrics, and retrieving data | ||
| | * | | | | 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 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | 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 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | |