Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2017-01-04 |
|\ | |||
| * | Merge pull request #13 from ctiller/patchy | Nicolas Noble | 2017-01-04 |
| |\ | | | | | | | Fixes for tests | ||
| | * | Fixes for tests | Craig Tiller | 2017-01-04 |
| | | | |||
| * | | Putting message size filter back. | Nicolas "Pixel" Noble | 2017-01-04 |
| |/ | |||
* | | Merge branch 'patchy' into slice_with_exec_ctx_and_build | Craig Tiller | 2017-01-04 |
|\| | |||
| * | Moving message_size_filter properly. | Nicolas "Pixel" Noble | 2017-01-04 |
| | | |||
| * | Merge remote-tracking branch 'google/master' into bazel-take-2 | Nicolas "Pixel" Noble | 2017-01-04 |
| |\ | |||
* | \ | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-12 |
|\ \ \ | | |/ | |/| | |||
| * | | Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h""" | Craig Tiller | 2016-12-12 |
| | | | |||
* | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-12 |
|\| | | |||
* | | | Fix build | Craig Tiller | 2016-12-06 |
| | | | |||
* | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-06 |
|\ \ \ | |||
| | * | | Revert "Revert "Remove redundant includes from string.h and tmpfile.h"" | Mark D. Roth | 2016-12-05 |
| |/ / | |||
| * | | Revert "Remove redundant includes from string.h and tmpfile.h" | Mark D. Roth | 2016-12-05 |
| | | | |||
| * | | Merge pull request #8922 from sreecha/slice_cleanup | Mark D. Roth | 2016-12-05 |
| |\ \ | | | | | | | | | Remove redundant includes from string.h and tmpfile.h | ||
| * | | | Use the same server code for both secure and insecure servers. | Mark D. Roth | 2016-12-02 |
| | | | | |||
| | * | | Temporarily enable gpr_slice_* functions to not break api compatibility | Sree Kuchibhotla | 2016-12-01 |
| | | | | |||
* | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-11-30 |
|\ \ \ \ | | |/ / | |/| | | |||
| | * | | Fixed build.yaml and ran generate_projects.sh. | Mark D. Roth | 2016-11-29 |
| | | | | |||
| | * | | Merge branch 'security_handshaker1' into security_handshaker2 | Mark D. Roth | 2016-11-29 |
| | |\ \ | | |/ / | |/| | | |||
| * | | | Run tools/buildgen/generate_projects.sh | ncteisen | 2016-11-28 |
| | | | | |||
* | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-11-18 |
|\| | | | |||
| | * | | Rename security handshaker files. | Mark D. Roth | 2016-11-17 |
| | | | | |||
| | * | | Use the same connector code for both secure and insecure clients. | Mark D. Roth | 2016-11-17 |
| | | | | |||
* | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-11-16 |
|\ \ \ \ | | |/ / | |/| | | |||
| | * | | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-16 |
| | |\ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #8680 from ctiller/no_more_legacy | Craig Tiller | 2016-11-15 |
| |\ \ \ | | | | | | | | | | | Remove legacy poller | ||
| * \ \ \ | Merge pull request #8335 from y-zeng/tos | Yuchen Zeng | 2016-11-11 |
| |\ \ \ \ | | | | | | | | | | | | | Add grpc_socket_mutator | ||
* | | | | | | Fix foward declaration duplication | Craig Tiller | 2016-11-10 |
|/ / / / / | |||
| | | * | | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-08 |
| | | |\ \ | |_|_|/ / |/| | | | | |||
| | * | | | Remove legacy poller | Craig Tiller | 2016-11-08 |
| | | | | | |||
* | | | | | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-08 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
* | | | | | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-08 |
|\ \ \ \ \ | |||
| | | | * \ | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-07 |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
| | * | | | | Get user agent right | Craig Tiller | 2016-11-04 |
| |/ / / / | |||
| * | | | | Merge pull request #8456 from ctiller/pid_ctl | Craig Tiller | 2016-11-04 |
| |\ \ \ \ | | | | | | | | | | | | | Simple PID controller | ||
* | | | | | | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-04 |
|\| | | | | | |||
| | | | * | | Rename method_config.[ch] to service_config.[ch]. | Mark D. Roth | 2016-11-03 |
| | |_|/ / | |/| | | | |||
| | | * | | Merge remote-tracking branch 'upstream/master' into tos | Yuchen Zeng | 2016-11-02 |
| | | |\ \ | |||
| * | | | | | Deprecate grpc::thread and sync in favor of std::thread,mutex,etc | Vijay Pai | 2016-11-01 |
| | | | | | | |||
| * | | | | | Regenerate all projects | Vijay Pai | 2016-11-01 |
| | |_|/ / | |/| | | | |||
| * | | | | Merge pull request #8380 from y-zeng/reflection_header | Yuchen Zeng | 2016-10-31 |
| |\ \ \ \ | | | | | | | | | | | | | Remove generated pb files | ||
* | | | | | | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-10-31 |
|\| | | | | | |||
| * | | | | | Merge branch 'master' into rpc_mgr | Sree Kuchibhotla | 2016-10-28 |
| |\ \ \ \ \ | |||
| | | | * \ \ | Merge github.com:grpc/grpc into pid_ctl | Craig Tiller | 2016-10-28 |
| | | | |\ \ \ | | | |_|/ / / | | |/| | | | | |||
| * | | | | | | Merge branch 'master' into rpc_mgr | Sree Kuchibhotla | 2016-10-27 |
| |\ \ \ \ \ \ | |||
* | \ \ \ \ \ \ | Merge branch 'buffer_pools_for_realsies' into grpc_slice | Craig Tiller | 2016-10-26 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
| * | | | | | | | Merge github.com:grpc/grpc into buffer_pools_for_realsies | Craig Tiller | 2016-10-26 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||
* | / | | | | | | Generate build files | Craig Tiller | 2016-10-26 |
|/ / / / / / / | |||
| | | | | | * | Updating BUILD file. | Nicolas "Pixel" Noble | 2016-10-27 |
| | | | | | | |