Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'decompression' of https://github.com/dgquintas/grpc into ↵ | 2015-07-19 | |
|\ | | | | | | | | | | | | | | | dgquintas-decompression Conflicts: Makefile vsprojects/Grpc.mak | ||
* \ | Merge with head | 2015-07-16 | |
|\ \ | |||
* | | | split iterator into its own file | 2015-07-16 | |
| | | | |||
| | * | Merge branch 'master' of github.com:grpc/grpc into decompression | 2015-07-16 | |
| | |\ | | |/ | |/| | |||
| * | | Merge pull request #2460 from vjpai/exposed_pool | 2015-07-16 | |
| |\ \ | | | | | | | | | Make thread_pool.h a public header | ||
| | * | | Change name of thread_pool files to fixed_size_thread_pool when | 2015-07-15 | |
| | | | | | | | | | | | | | | | | appropriate | ||
| | | * | Merge branch 'master' of github.com:grpc/grpc into decompression | 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 | ||
| | * | | Make thread_pool.h a public header | 2015-07-15 | |
| |/ / |/| | | | | | | | | | | | Rename ThreadPool -> FixedSizeThreadPool to allow for later introduction of DynamicSizeThreadPool | ||
| * | | Merge branch 'master' into lockfree-stack | 2015-07-10 | |
| |\ \ | |/ / |/| | | |||
| * | | Initial checkin commit for lockfree stack. | 2015-07-10 | |
| | | | | | | | | | | | | Tests not yet included. | ||
* | | | Add a version string and a function to retrieve it | 2015-07-10 | |
| | | | |||
| | * | Merge branch 'master' of github.com:grpc/grpc into decompression | 2015-07-09 | |
| | |\ | | |/ | |/| | |||
* | | | Merge remote-tracking branch 'upstream/master' into security_context2 | 2015-07-09 | |
|\| | | |||
| * | | Merge branch 'master' of github.com:grpc/grpc into jwt_verifier | 2015-07-08 | |
| |\ \ | |||
| | | * | Merge branch 'master' of github.com:grpc/grpc into decompression | 2015-07-08 | |
| | | |\ | | | |/ | | |/| | |||
* | | | | Merge remote-tracking branch 'upstream/master' into security_context2 | 2015-07-07 | |
|\ \ \ \ | | |/ / | |/| | | |||
* | | | | merge with upstream and resolve conflicts | 2015-07-06 | |
|\ \ \ \ | |||
* | | | | | compiles | 2015-07-06 | |
| | | | | | |||
| | | | * | Merge branch 'master' of github.com:grpc/grpc into decompression | 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. | 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 | 2015-06-29 | |
| | | | | |||
| | * | | Unix resolver, bug fixes | 2015-06-29 | |
| | | | | |||
| | * | | Factor out channel state watching | 2015-06-27 | |
| | | | | |||
| | * | | Merge github.com:grpc/grpc into tis-but-thy-name | 2015-06-26 | |
| | |\ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #2149 from ctiller/oops-i-split-it-again | 2015-06-26 | |
| |\ \ \ | | | | | | | | | | | Initial transport lock split up | ||
| | | * | | Introduce connector, to help subchannel connect | 2015-06-25 | |
| | | | | | |||
| | | * | | Plumbing transport_op changes through | 2015-06-25 | |
| | | | | | |||
| | | * | | Merge branch 'oops-i-split-it-again' into tis-but-thy-name | 2015-06-25 | |
| | | |\ \ | | | |/ / | | |/| | | |||
| | | * | | Merge github.com:grpc/grpc into tis-but-thy-name | 2015-06-25 | |
| | | |\ \ | |||
| | * | \ \ | Merge github.com:grpc/grpc into oops-i-split-it-again | 2015-06-25 | |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||
| | | | * | | Refactoring progress towards integrating client configs | 2015-06-25 | |
| | | | | | | |||
| * | | | | | Merge github.com:grpc/grpc into are-includes-sane | 2015-06-25 | |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | Conflicts: tools/doxygen/Doxyfile.c++.internal | ||
| * | | | | | Add a test that headers are properly in build.json | 2015-06-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Clean up anything that failed | ||
| | | | * | | Implementation work for client_config | 2015-06-24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - uri parsing - dns resolution | ||
| | | | * | | Merge github.com:grpc/grpc into that-which-we-call-a-rose | 2015-06-24 | |
| | | | |\ \ | | |_|_|/ / | |/| | | | | | | | | | | Introduce resolver_factory | ||
| | | * | | | Merge github.com:grpc/grpc into oops-i-split-it-again | 2015-06-24 | |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| | * | | | | Make it less likely a build.json change triggers a merge conflict | 2015-06-23 | |
| |/ / / / | |||
| | | * | | Merge github.com:grpc/grpc into that-which-we-call-a-rose | 2015-06-23 | |
| | | |\ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | Conflicts: gRPC.podspec tools/doxygen/Doxyfile.core.internal | ||
| | | * | | Flesh out things and make them compile | 2015-06-23 | |
| | | | | | |||
| * | | | | Fix doxyfile for real | 2015-06-23 | |
| | | | | | |||
| * | | | | clang-format messed up Doxyfile.c++, restored | 2015-06-23 | |
| | | | | | |||
| * | | | | Add missing headers to build.json | 2015-06-23 | |
| | | | | | |||
| | | | * | Merge branch 'master' of github.com:grpc/grpc into decompression | 2015-06-23 | |
| | | | |\ | | |_|_|/ | |/| | | | |||
| * | | | | Merge pull request #1969 from ctiller/one-shouldnt-depend-on-protobufs | 2015-06-23 | |
| |\ \ \ \ | | | | | | | | | | | | | Remove Protobuf dependency for C++ | ||
| | | * \ \ | Merge github.com:grpc/grpc into oops-i-split-it-again | 2015-06-23 | |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Add pollset_set.h to build.json | 2015-06-20 | |
| | |_|/ / | |/| | | | |||
| | * | | | Merge github.com:grpc/grpc into one-shouldnt-depend-on-protobufs | 2015-06-19 | |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | | | * | Added generated configs | 2015-06-19 | |
| | | | | | |||
| * | | | | Merge github.com:grpc/grpc into we-dont-need-no-backup | 2015-06-18 | |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | Conflicts: gRPC.podspec tools/doxygen/Doxyfile.core.internal | ||
| | | | * | Merge github.com:grpc/grpc into oops-i-split-it-again | 2015-06-18 | |
| | | | |\ | | | |_|/ | | |/| | |