aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
Commit message (Collapse)AuthorAge
* Merge github.com:grpc/grpc into shindigGravatar Craig Tiller2015-09-24
|\
* \ Merge github.com:grpc/grpc into shindigGravatar Craig Tiller2015-09-24
|\ \
| | * Merge github.com:grpc/grpc into come-out-of-the-shadowGravatar Craig Tiller2015-09-24
| | |\ | | |/ | |/|
| * | Disable zookeeper test for nowGravatar Craig Tiller2015-09-24
| | |
| * | Merge pull request #3372 from grpc/release-0_11Gravatar David G. Quintas2015-09-23
| |\ \ | | | | | | | | Release 0.11 to master upmerge.
| | * | Fixing Makefile issue which would re-evaluate the base path for included ↵Gravatar Nicolas "Pixel" Noble2015-09-23
| | | | | | | | | | | | | | | | dependency files.
| | * | Fixing usage of the BUILDDIR variable.Gravatar Nicolas "Pixel" Noble2015-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 renameGravatar Craig Tiller2015-09-22
| | | |
* | | | Split closures from iomgr.hGravatar Craig Tiller2015-09-22
| | | |
* | | | Merge github.com:grpc/grpc into we-are-oneGravatar Craig Tiller2015-09-22
|\| | |
| * | | Merge pull request #3027 from jboeuf/security_connector_refactoringGravatar Craig Tiller2015-09-22
| |\ \ \ | | | | | | | | | | Security connector refactoring
* | | | | FixesGravatar Craig Tiller2015-09-21
| | | | |
| * | | | Merge branch 'master' of github.com:grpc/grpc into rr_with_registryGravatar David Garcia Quintas2015-09-16
| |\ \ \ \
| | | * \ \ Merge branch 'master' of github.com:grpc/grpc into ↵Gravatar Julien Boeuf2015-09-15
| | | |\ \ \ | | | |/ / / | | |/| | | | | | | | | security_connector_refactoring
* | | | | | Merge github.com:grpc/grpc into shindigGravatar Craig Tiller2015-09-15
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #3340 from grpc/release-0_11Gravatar Eric Anderson2015-09-14
| |\ \ \ \ \ | | | |_|/ / | | |/| | | Release 0.11 branch to master.
| | | * | | Merge branch 'master' of github.com:grpc/grpc into rr_with_registryGravatar David Garcia Quintas2015-09-11
| | | |\ \ \ | | |_|/ / / | |/| | | |
* | | | | | Merge github.com:grpc/grpc into shindigGravatar Craig Tiller2015-09-11
|\| | | | |
| * | | | | Merge pull request #3248 from dgquintas/lb_registryGravatar Craig Tiller2015-09-11
| |\ \ \ \ \ | | | | | | | | | | | | | | Introduced a registry for LB policies.
| | | | | | * Enable -WshadowGravatar Craig Tiller2015-09-11
| | |_|_|_|/ | |/| | | |
| * | | | | Merge github.com:grpc/grpc into immolating-conversionGravatar Craig Tiller2015-09-11
| |\ \ \ \ \
| | | | * | | grpc++.h was not installedGravatar Craig Tiller2015-09-11
| | | |/ / / | | |/| | |
| * | | | | Enable -WconversionGravatar Craig Tiller2015-09-10
| | | | | |
| * | | | | First round of fixing up implicit 64->32 bit conversionsGravatar Craig Tiller2015-09-10
| | | | | |
| * | | | | Core compiles with -Wsign-conversionGravatar Craig Tiller2015-09-10
| | | | | |
| * | | | | Merge github.com:grpc/grpc into immolating-conversionGravatar Craig Tiller2015-09-10
| |\| | | |
| * | | | | Sign conversion fixesGravatar Craig Tiller2015-09-10
| | | | | |
* | | | | | Workqueue: interface, test, and posix implementationGravatar Craig Tiller2015-09-09
| |/ / / / |/| | | |
| | | * | Merge remote-tracking branch 'origin/uri_query_fragments' into rr_with_registryGravatar David Garcia Quintas2015-09-08
| | | |\ \ | |_|_|/ / |/| | | |
| | | * | Added round robin LB policy.Gravatar David Garcia Quintas2015-09-08
| | |/ /
* | | | Merge pull request #3190 from ctiller/daisy-dukesGravatar Yang Gao2015-09-03
|\ \ \ \ | | | | | | | | | | Fix flow control issues
| | | * | Introduced a registry for LB policies.Gravatar David Garcia Quintas2015-09-03
| | | | |
* | | | | Merge pull request #3183 from ctiller/second-comingGravatar Nicolas Noble2015-09-02
|\ \ \ \ \ | |_|_|/ / |/| | | | Refactor Endpoint API
| | * | | Merge github.com:grpc/grpc into daisy-dukesGravatar Craig Tiller2015-09-01
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | Conflicts: build.json vsprojects/Grpc.mak
* | | | | Bumping revision to 0.11 for beta.Gravatar Nicolas "Pixel" Noble2015-09-01
| | | | |
| * | | | Merge branch 'third-coming' into endpointsGravatar Craig Tiller2015-09-01
|/| | | |
* | | | | Merge github.com:grpc/grpc into cleaner-buildGravatar Craig Tiller2015-08-31
|\ \ \ \ \
| * \ \ \ \ Merge pull request #3107 from a-veitch/view_apiGravatar Hongyu Chen2015-08-31
| |\ \ \ \ \ | | | | | | | | | | | | | | API for: defining view and aggregations, associating them with metrics, and retrieving data
| | | * \ \ \ Merge branch 'cleaner-build' into third-comingGravatar Craig Tiller2015-08-31
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | |
| | | * | | | Merge github.com:grpc/grpc into second-comingGravatar Craig Tiller2015-08-31
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
* / | | | | | Generated changesGravatar Craig Tiller2015-08-31
|/ / / / / /
| * | | | | mergeGravatar Alistair Veitch2015-08-31
| |\ \ \ \ \
| | | | * \ \ Merge github.com:grpc/grpc into daisy-dukesGravatar Craig Tiller2015-08-31
| | | | |\ \ \ | | | |_|/ / / | | |/| | | |
* | | | | | | Fixing headers and paths after merge with upstream.Gravatar Julien Boeuf2015-08-30
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processorGravatar Julien Boeuf2015-08-30
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'master' into tracing_apiGravatar Alistair Veitch2015-08-28
| |\ \ \ \ \ \
| | | * \ \ \ \ merge to headGravatar Alistair Veitch2015-08-28
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
* | | | | | | | Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processorGravatar Julien Boeuf2015-08-27
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Fix buildGravatar yang-g2015-08-27
| | | | | | | |
* | | | | | | | Merge branch 'master' of github.com:grpc/grpc into cpp_auth_md_processorGravatar Julien Boeuf2015-08-27
|\| | | | | | |