Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into shindig | Craig Tiller | 2015-09-24 |
|\ | |||
* \ | Merge github.com:grpc/grpc into shindig | Craig Tiller | 2015-09-24 |
|\ \ | |||
| | * | Merge github.com:grpc/grpc into come-out-of-the-shadow | Craig Tiller | 2015-09-24 |
| | |\ | | |/ | |/| | |||
| * | | Disable zookeeper test for now | Craig Tiller | 2015-09-24 |
| | | | |||
| * | | Merge pull request #3372 from grpc/release-0_11 | David G. Quintas | 2015-09-23 |
| |\ \ | | | | | | | | | Release 0.11 to master upmerge. | ||
| | * | | Fixing Makefile issue which would re-evaluate the base path for included ↵ | Nicolas "Pixel" Noble | 2015-09-23 |
| | | | | | | | | | | | | | | | | dependency files. | ||
| | * | | Fixing usage of the BUILDDIR variable. | Nicolas "Pixel" Noble | 2015-09-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now both using absolute and relative directory for that variable should work. BUILDDIR=/tmp/build-grpc make BUILDDIR=../build-grpc make | ||
* | | | | 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 branch 'master' of github.com:grpc/grpc into rr_with_registry | David Garcia Quintas | 2015-09-11 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
* | | | | | | 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. | ||
| | | | | | * | Enable -Wshadow | Craig Tiller | 2015-09-11 |
| | |_|_|_|/ | |/| | | | | |||
| * | | | | | Merge github.com:grpc/grpc into immolating-conversion | Craig Tiller | 2015-09-11 |
| |\ \ \ \ \ | |||
| | | | * | | | grpc++.h was not installed | Craig Tiller | 2015-09-11 |
| | | |/ / / | | |/| | | | |||
| * | | | | | Enable -Wconversion | Craig Tiller | 2015-09-10 |
| | | | | | | |||
| * | | | | | First round of fixing up implicit 64->32 bit conversions | Craig Tiller | 2015-09-10 |
| | | | | | | |||
| * | | | | | Core compiles with -Wsign-conversion | Craig Tiller | 2015-09-10 |
| | | | | | | |||
| * | | | | | Merge github.com:grpc/grpc into immolating-conversion | Craig Tiller | 2015-09-10 |
| |\| | | | | |||
| * | | | | | Sign conversion fixes | Craig Tiller | 2015-09-10 |
| | | | | | | |||
* | | | | | | 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 pull request #3183 from ctiller/second-coming | Nicolas Noble | 2015-09-02 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Refactor Endpoint API | ||
| | * | | | Merge github.com:grpc/grpc into daisy-dukes | Craig Tiller | 2015-09-01 |
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | Conflicts: build.json vsprojects/Grpc.mak | ||
* | | | | | Bumping revision to 0.11 for beta. | Nicolas "Pixel" Noble | 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 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | API for: defining view and aggregations, associating them with metrics, and retrieving data | ||
| | | * \ \ \ | 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 |
| |\ \ \ \ \ | |||
| | | | * \ \ | 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 |
|\| | | | | | | |