Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #2497 from jcanizales/update-head-v-to-0.7 | Michael Lumish | 2015-07-20 |
|\ | | | | | Move head podspec to v0.7. | ||
| * | Move head podspec to v0.7. | Jorge Canizales | 2015-07-17 |
| | | | | | | | | Readd the commented-out config to suppress warnings, to have it handy for submissions. | ||
* | | Merge branch 'master' of github.com:grpc/grpc into decompression | David Garcia Quintas | 2015-07-15 |
|\| | | | | | | | | | | | | | | | | | | | # Conflicts: # Makefile # include/grpc++/client_context.h # include/grpc++/server_context.h # src/cpp/client/client_context.cc # src/cpp/server/server_context.cc # vsprojects/Grpc.mak | ||
| * | Merge branch 'master' into lockfree-stack | vjpai | 2015-07-10 |
| |\ | |||
| * | | 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 |
| |/ | |||
* | | Merge branch 'master' of github.com:grpc/grpc into decompression | David Garcia Quintas | 2015-07-09 |
|\| | |||
| * | Merge branch 'master' of github.com:grpc/grpc into jwt_verifier | Julien Boeuf | 2015-07-08 |
| |\ | |||
* | \ | Merge branch 'master' of github.com:grpc/grpc into decompression | David Garcia Quintas | 2015-07-08 |
|\ \ \ | | |/ | |/| | |||
| * | | Merge branch 'reset-thy-counts-or-fear-my-wrath' into tis-but-thy-name | Craig Tiller | 2015-07-06 |
| |\ \ | |||
| | * | | Fix build breakage of moving include/grpc/ into grpc/ | Jorge Canizales | 2015-07-02 |
| | | | | |||
* | | | | Merge branch 'master' of github.com:grpc/grpc into decompression | David Garcia Quintas | 2015-07-01 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Makefile # gRPC.podspec # src/core/surface/call.c # src/core/transport/chttp2/frame_data.c # tools/doxygen/Doxyfile.core.internal # vsprojects/Grpc.mak | ||
| | | * | 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. | ||
| | * | Merge github.com:grpc/grpc into tis-but-thy-name | Craig Tiller | 2015-06-29 |
| | |\ | | |/ | |/| | |||
| | * | Use connectivity state tracking code in chttp2 transport | Craig Tiller | 2015-06-29 |
| | | | |||
| | * | Unix resolver, bug fixes | Craig Tiller | 2015-06-29 |
| | | | |||
| * | | Add roots.pem bundle to the Bazel target, and use a better bundle name. | Jorge Canizales | 2015-06-28 |
| | | | |||
| | * | Factor out channel state watching | Craig Tiller | 2015-06-27 |
| | | | |||
| | * | 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 |
| | | | | |||
| | | * | 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 so-freaking-sick-of-irrelevant-merge-conflicts | Craig Tiller | 2015-06-24 |
| | |\ \ \ | | | | |/ | | | |/| | |||
| | | * | | Merge pull request #2195 from jcanizales/rewrite-grpcclient-includes | Michael Lumish | 2015-06-24 |
| | | |\ \ | | | | | | | | | | | | | Have Cocoapods rename includes in the core wrapper | ||
| * | | \ \ | Merge github.com:grpc/grpc into oops-i-split-it-again | Craig Tiller | 2015-06-24 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||
| | | | * | | Have Cocoapods rename includes in the core wrapper | Jorge Canizales | 2015-06-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/grpc/grpc/issues/2194 . | ||
| | * | | | | Move header_mappings_dir one dir up so imports are like <RxLibrary/...> | Jorge Canizales | 2015-06-23 |
| | | |/ / | | |/| | | | | | | | | | | | | Part of fixing https://github.com/grpc/grpc/issues/2192 | ||
| | | * | | Merge github.com:grpc/grpc into so-freaking-sick-of-irrelevant-merge-conflicts | Craig Tiller | 2015-06-23 |
| | | |\ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | Conflicts: gRPC.podspec templates/gRPC.podspec.template | ||
| | | * | | Make it less likely a build.json change triggers a merge conflict | Craig Tiller | 2015-06-23 |
| | | | | | |||
| | * | | | Made podspec move include/grpc up a level | murgatroid99 | 2015-06-23 |
| | | | | | |||
| | | | * | 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 |
| | | | | | |||
* | | | | | Merge branch 'master' of github.com:grpc/grpc into decompression | David Garcia Quintas | 2015-06-23 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||
| | * | | | Merge github.com:grpc/grpc into oops-i-split-it-again | Craig Tiller | 2015-06-23 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | | * | | Undid removal of podspec header comments | murgatroid99 | 2015-06-22 |
| | | | | | |||
| | | * | | Removed redundant include paths from podspec | murgatroid99 | 2015-06-22 |
| | |/ / | |/| | | |||
| * | | | Merge pull request #2158 from murgatroid99/generated_files_info_message | Nicolas Noble | 2015-06-22 |
| |\ \ \ | | | | | | | | | | | Generated files info message | ||
| | * | | | Regenerated files | murgatroid99 | 2015-06-22 |
| | | |/ | | |/| | |||
| * / | | Add pollset_set.h to build.json | Jorge Canizales | 2015-06-20 |
| |/ / | |||
* | | | Added generated configs | David Garcia Quintas | 2015-06-19 |
| | | | |||
| | * | Merge branch 'we-dont-need-no-backup' into oops-i-split-it-again | Craig Tiller | 2015-06-18 |
| | |\ | | |/ | |/| | | | | | | | Conflicts: tools/doxygen/Doxyfile.core.internal | ||
| * | | Merge github.com:grpc/grpc into we-dont-need-no-backup | Craig Tiller | 2015-06-18 |
| |\ \ | |/ / |/| / | |/ | | | | | Conflicts: gRPC.podspec tools/doxygen/Doxyfile.core.internal | ||
* | | Re-enabled warnings in the gRPC podspec | murgatroid99 | 2015-06-18 |
| | | |||
* | | Added missing but included headers to build.json | murgatroid99 | 2015-06-17 |
| | | |||
| * | podspec | Craig Tiller | 2015-06-17 |
|/ | |||
* | Fixed file renaming in podspec template | murgatroid99 | 2015-06-16 |
| |