Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #2383 from vjpai/lockfree-stack | Craig Tiller | 2015-07-15 |
|\ | | | | | Lockfree stack | ||
* \ | Merge pull request #2398 from nicolasnoble/we-have-many-solutions-now | Jan Tattermusch | 2015-07-11 |
|\ \ | | | | | | | Fixing VS's documentation. | ||
| * | | Fixing VS's documentation. | Nicolas "Pixel" Noble | 2015-07-11 |
| | | | | | | | | | | | | The nuget command line tool can't find which solution we want to restore packages on. The documentation needs some update. | ||
* | | | Faking tools target for win32. | Nicolas "Pixel" Noble | 2015-07-11 |
|/ / | | | | | | | With run_test.py, we need a tools target now. Let's fake it for Windows so we can at least build. | ||
| * | Merge branch 'master' into lockfree-stack | vjpai | 2015-07-10 |
| |\ | |/ |/| | |||
| * | Debug and add in generated build files | Vijay Pai | 2015-07-10 |
| | | |||
* | | Merge pull request #2368 from ctiller/they-gave-me-a-badge | Nicolas Noble | 2015-07-10 |
|\ \ | | | | | | | Add a version string and a function to retrieve it | ||
| | * | Initial checkin commit for lockfree stack. | Vijay Pai | 2015-07-10 |
| | | | | | | | | | | | | Tests not yet included. | ||
| * | | Add a version string and a function to retrieve it | Craig Tiller | 2015-07-10 |
| | | | |||
* | | | bumped version of C# | Jan Tattermusch | 2015-07-09 |
| | | | |||
* | | | Backport of pull request #2313 into release-0_10. | jboeuf | 2015-07-10 |
| |/ |/| | |||
| * | Merge remote-tracking branch 'upstream/master' into security_context2 | yang-g | 2015-07-09 |
| |\ | |/ |/| | |||
* | | Merge branch 'master' of github.com:grpc/grpc into jwt_verifier | Julien Boeuf | 2015-07-08 |
|\ \ | |||
| | * | resolve comments | yang-g | 2015-07-07 |
| | | | |||
| | * | Merge remote-tracking branch 'upstream/master' into security_context2 | yang-g | 2015-07-07 |
| | |\ | | |/ | |/| | |||
| | * | merge with upstream and resolve conflicts | yang-g | 2015-07-06 |
| | |\ | |||
| | * | | compiles | yang-g | 2015-07-06 |
| | | | | |||
| | | * | Merge github.com:grpc/grpc into forever-is-a-long-time | Craig Tiller | 2015-06-30 |
| | | |\ | |||
* | | | | | Adding JWT verifier. | Julien Boeuf | 2015-06-30 |
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Still missing: - Caching of the already checked JWTs (although it could be done at an upper layer). - Caching of the jwks_uri to avoid 2 roundtrips for each verification. | ||
| * | | | Use connectivity state tracking code in chttp2 transport | Craig Tiller | 2015-06-29 |
| | | | | |||
| * | | | Merge branch 'forever-is-a-long-time' into tis-but-thy-name | Craig Tiller | 2015-06-29 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | Conflicts: Makefile vsprojects/Grpc.mak | ||
| * | | | Unix resolver, bug fixes | Craig Tiller | 2015-06-29 |
| | | | | |||
| * | | | Factor out channel state watching | Craig Tiller | 2015-06-27 |
| | | | | |||
| * | | | Merge github.com:grpc/grpc into tis-but-thy-name | Craig Tiller | 2015-06-26 |
| |\ \ \ | |/ / / |/| | | | |||
* | | | | Merge pull request #2149 from ctiller/oops-i-split-it-again | Vijay Pai | 2015-06-26 |
|\ \ \ \ | | | | | | | | | | | Initial transport lock split up | ||
| | | * \ | Merge github.com:grpc/grpc into forever-is-a-long-time | Craig Tiller | 2015-06-26 |
| | | |\ \ | |_|_|/ / |/| | | | | |||
| | | * | | Tidy up test to meet our standards | Craig Tiller | 2015-06-26 |
| | | | | | |||
| | | * | | Rename test into the right place | Craig Tiller | 2015-06-26 |
| | | | | | |||
| | | * | | BLARGHAFLARGHAAHAJHAKJHATJHKAYMNHZIYRN | Masood Malekghassemi | 2015-06-25 |
| | | | | | |||
| | * | | | Introduce connector, to help subchannel connect | Craig Tiller | 2015-06-25 |
| | | | | | |||
| | * | | | Plumbing transport_op changes through | Craig Tiller | 2015-06-25 |
| | | | | | |||
| | * | | | Merge branch 'oops-i-split-it-again' into tis-but-thy-name | Craig Tiller | 2015-06-25 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | * | | | Merge github.com:grpc/grpc into tis-but-thy-name | Craig Tiller | 2015-06-25 |
| | |\| | | |||
| * | | | | Merge github.com:grpc/grpc into oops-i-split-it-again | Craig Tiller | 2015-06-25 |
| |\ \ \ \ | | | |/ / | | |/| | | |||
| | | * | | Refactoring progress towards integrating client configs | Craig Tiller | 2015-06-25 |
| | | | | | |||
* | | | | | Merge github.com:grpc/grpc into are-includes-sane | Craig Tiller | 2015-06-25 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: tools/doxygen/Doxyfile.c++.internal | ||
* | | | | | Add a test that headers are properly in build.json | Craig Tiller | 2015-06-25 |
| | | | | | | | | | | | | | | | | | | | | Clean up anything that failed | ||
| | | * | | Implementation work for client_config | Craig Tiller | 2015-06-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - uri parsing - dns resolution | ||
| | | * | | Merge github.com:grpc/grpc into that-which-we-call-a-rose | Craig Tiller | 2015-06-24 |
| | | |\ \ | |_|_|/ / |/| | | | | | | | | | Introduce resolver_factory | ||
| | * | | | Merge github.com:grpc/grpc into oops-i-split-it-again | Craig Tiller | 2015-06-24 |
| | |\ \ \ | |_|/ / / |/| | | | | |||
| | | * | | Merge github.com:grpc/grpc into that-which-we-call-a-rose | Craig Tiller | 2015-06-23 |
| | | |\ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Conflicts: gRPC.podspec tools/doxygen/Doxyfile.core.internal | ||
| | | * | | Flesh out things and make them compile | Craig Tiller | 2015-06-23 |
| | | | | | |||
| * | | | | Move some code out of src/ into tools/ | Craig Tiller | 2015-06-23 |
|/ / / / | | | | | | | | | | | | | It shouldn't count towards coverage | ||
* | | | | Add missing headers to build.json | yang-g | 2015-06-23 |
| | | | | |||
* | | | | Merge pull request #1969 from ctiller/one-shouldnt-depend-on-protobufs | Yang Gao | 2015-06-23 |
|\ \ \ \ | | | | | | | | | | | Remove Protobuf dependency for C++ | ||
| | * \ \ | Merge github.com:grpc/grpc into oops-i-split-it-again | Craig Tiller | 2015-06-23 |
| | |\ \ \ | |_|/ / / |/| | | | | |||
* | | | | | Merge pull request #2154 from jcanizales/fix-build-json | Craig Tiller | 2015-06-22 |
|\ \ \ \ \ | | | | | | | | | | | | | Add pollset_set.h to build.json | ||
* \ \ \ \ \ | Merge branch 'master' of https://github.com/grpc/grpc into ssl_auth_context_fix | Julien Boeuf | 2015-06-22 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||
| | * | | | | Add pollset_set.h to build.json | Jorge Canizales | 2015-06-20 |
| |/ / / / | |||
| | * | | | Merge github.com:grpc/grpc into one-shouldnt-depend-on-protobufs | Craig Tiller | 2015-06-19 |
| | |\ \ \ | | |/ / / | |/| | | |