Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about | 2015-07-31 | |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: vsprojects/Grpc.mak vsprojects/grpc.sln vsprojects/grpc/grpc.vcxproj vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj vsprojects/grpc_unsecure/grpc_unsecure.vcxproj | ||
| * | Merge branch 'master' into issue_2709 | 2015-07-30 | |
| |\ | |||
| * | | Move grpc_census_call_*_context calls into public header | 2015-07-30 | |
| | | | |||
* | | | Add a subchannel factory decorator library | 2015-07-29 | |
| |/ |/| | |||
* | | Merge github.com:grpc/grpc into ↵ | 2015-07-26 | |
|\| | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other Conflicts: src/core/iomgr/tcp_server_windows.c | ||
| * | Merge branch 'master' into deepend | 2015-07-24 | |
| |\ | |||
| * | | Add dynamic thread pool and initial port of test | 2015-07-23 | |
| | | | |||
* | | | Merge github.com:grpc/grpc into ↵ | 2015-07-23 | |
|\ \ \ | | |/ | |/| | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| * | | Merge pull request #2493 from a-veitch/record_stat | 2015-07-23 | |
| |\ \ | | | | | | | | | Census record stats API | ||
| | * | | fix build | 2015-07-20 | |
| | | | | |||
| * | | | Add ipv4:, ipv6: schemes | 2015-07-20 | |
| | |/ | |/| | |||
* | | | Merge github.com:grpc/grpc into ↵ | 2015-07-20 | |
|\| | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| * | | Merge branch 'decompression' of https://github.com/dgquintas/grpc into ↵ | 2015-07-19 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dgquintas-decompression Conflicts: Makefile vsprojects/Grpc.mak | ||
* | | | | Merge github.com:grpc/grpc into ↵ | 2015-07-17 | |
|\| | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| | | * | rebuild makefile | 2015-07-17 | |
| | | | | |||
| * | | | 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 github.com:grpc/grpc into ↵ | 2015-07-16 | |
|\ \ \ \ | | |/ / | |/| | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| * | | | 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 | ||
* | | | | | Client connectivity API | 2015-07-15 | |
|/ / / / | | | | | | | | | | | | | | | | | Initial plumbing work; needs tests and more client_channel implementation. | ||
| | | * | 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 | |
| | | |\ | | |_|/ | |/| | | |||
| | * | | resolve comments | 2015-07-07 | |
| | | | | |||
| | * | | Merge remote-tracking branch 'upstream/master' into security_context2 | 2015-07-07 | |
| | |\ \ | | |/ / | |/| | | |||
| | * | | Merge remote-tracking branch 'upstream/master' into security_context2 | 2015-07-06 | |
| | |\ \ | |||
| * | \ \ | Merge github.com:grpc/grpc into tis-but-thy-name | 2015-07-06 | |
| |\ \ \ \ | | | |/ / | | |/| | | |||
| | | * | | merge with upstream and resolve conflicts | 2015-07-06 | |
| | | |\ \ | |||
| | | * | | | compiles | 2015-07-06 | |
| | | | | | | |||
| | * | | | | Minor doc fix in BUILD and BUILD.template | 2015-07-02 | |
| | | |/ / | | |/| | | |||
| | | | * | 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 | ||
| * | | | | Merge github.com:grpc/grpc into tis-but-thy-name | 2015-06-30 | |
| |\| | | | |||
* | | | | | 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. | ||
| | * | | | Add Bazel target for ObjC gRPC runtime | 2015-06-29 | |
| |/ / / |/| | | | |||
| * | | | Merge github.com:grpc/grpc into tis-but-thy-name | 2015-06-29 | |
| |\ \ \ | |/ / / |/| | | | |||
| * | | | Use connectivity state tracking code in chttp2 transport | 2015-06-29 | |
| | | | | |||
| * | | | Unix resolver, bug fixes | 2015-06-29 | |
| | | | | |||
* | | | | Fix indents of rx_library blaze target | 2015-06-28 | |
| | | | | |||
* | | | | Add roots.pem bundle to the Bazel target, and use a better bundle name. | 2015-06-28 | |
| | | | | |||
* | | | | Add BUILD target for GRPCClient | 2015-06-28 | |
| | | | | |||
| * | | | Factor out channel state watching | 2015-06-27 | |
| | | | | |||
* | | | | Blaze dependency on //external:libssl_objc | 2015-06-26 | |
| | | | |