Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into ↵ | 2017-01-13 | |
|\ | | | | | | | revert-9063-revert-8951-revert-8949-revert-8922-slice_cleanup | ||
| * | remove unneeded/broken targets from CMakeLists.exe | 2017-01-12 | |
| | | |||
| * | successfuly compile gRPC with cmake+Ninja | 2017-01-12 | |
| | | |||
| * | Handshaker plugin mechanism. | 2017-01-06 | |
| | | |||
* | | Merge remote-tracking branch 'upstream/master' into ↵ | 2017-01-06 | |
|\| | | | | | | | revert-9063-revert-8951-revert-8949-revert-8922-slice_cleanup | ||
| * | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2017-01-04 | |
| |\ | |||
| * \ | Merge branch 'patchy' into slice_with_exec_ctx_and_build | 2017-01-04 | |
| |\ \ | |||
| | * | | Moving message_size_filter properly. | 2017-01-04 | |
| | |/ | |||
| * | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-12-12 | |
| |\| | |||
* | | | Revert "Revert "Revert "Revert "Remove redundant includes from string.h and ↵ | 2016-12-12 | |
| |/ |/| | | | | | tmpfile.h"""" | ||
* | | Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h""" | 2016-12-12 | |
| | | |||
| * | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-12-12 | |
| |\ | |/ |/| | |||
| * | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-12-06 | |
| |\ | |||
* | | | Revert "Revert "Remove redundant includes from string.h and tmpfile.h"" | 2016-12-05 | |
| |/ |/| | |||
* | | Revert "Remove redundant includes from string.h and tmpfile.h" | 2016-12-05 | |
| | | |||
* | | Merge pull request #8922 from sreecha/slice_cleanup | 2016-12-05 | |
|\ \ | | | | | | | Remove redundant includes from string.h and tmpfile.h | ||
* | | | Use the same server code for both secure and insecure servers. | 2016-12-02 | |
| | | | |||
| * | | Temporarily enable gpr_slice_* functions to not break api compatibility | 2016-12-01 | |
| | | | |||
| | * | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-11-30 | |
| | |\ | | |/ | |/| | |||
* | | | Fixed build.yaml and ran generate_projects.sh. | 2016-11-29 | |
| | | | |||
* | | | Merge branch 'security_handshaker1' into security_handshaker2 | 2016-11-29 | |
|\| | | |||
| * | | Run tools/buildgen/generate_projects.sh | 2016-11-28 | |
| | | | |||
| | * | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-11-18 | |
| | |\ | | |/ | |/| | |||
* | | | Rename security handshaker files. | 2016-11-17 | |
| | | | |||
* | | | Use the same connector code for both secure and insecure clients. | 2016-11-17 | |
| | | | |||
| | * | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-11-16 | |
| | |\ | |_|/ |/| | | |||
| * | | Merge remote-tracking branch 'upstream/master' into service_config_json | 2016-11-16 | |
| |\ \ | |/ / |/| | | |||
* | | | Merge pull request #8680 from ctiller/no_more_legacy | 2016-11-15 | |
|\ \ \ | | | | | | | | | Remove legacy poller | ||
* \ \ \ | Merge pull request #8335 from y-zeng/tos | 2016-11-11 | |
|\ \ \ \ | | | | | | | | | | | Add grpc_socket_mutator | ||
| | | | * | Fix foward declaration duplication | 2016-11-10 | |
| |_|_|/ |/| | | | |||
| | | * | Merge remote-tracking branch 'upstream/master' into service_config_json | 2016-11-08 | |
| | | |\ | |_|_|/ |/| | | | |||
| | * | | Remove legacy poller | 2016-11-08 | |
| | | | | |||
* | | | | Merge github.com:grpc/grpc into grpc_slice | 2016-11-08 | |
|\ \ \ \ | | |/ / | |/| | | |||
* | | | | Merge github.com:grpc/grpc into grpc_slice | 2016-11-08 | |
|\ \ \ \ | |||
| | | | * | Merge remote-tracking branch 'upstream/master' into service_config_json | 2016-11-07 | |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | * | | | Get user agent right | 2016-11-04 | |
| |/ / / | |||
| * | | | Merge pull request #8456 from ctiller/pid_ctl | 2016-11-04 | |
| |\ \ \ | | | | | | | | | | | Simple PID controller | ||
* | | | | | Merge github.com:grpc/grpc into grpc_slice | 2016-11-04 | |
|\| | | | | |||
| | | | * | Rename method_config.[ch] to service_config.[ch]. | 2016-11-03 | |
| | |_|/ | |/| | | |||
| | | * | Merge remote-tracking branch 'upstream/master' into tos | 2016-11-02 | |
| | | |\ | |||
| * | | | | Deprecate grpc::thread and sync in favor of std::thread,mutex,etc | 2016-11-01 | |
| | | | | | |||
| * | | | | Regenerate all projects | 2016-11-01 | |
| | |_|/ | |/| | | |||
| * | | | Merge pull request #8380 from y-zeng/reflection_header | 2016-10-31 | |
| |\ \ \ | | | | | | | | | | | Remove generated pb files | ||
* | | | | | Merge github.com:grpc/grpc into grpc_slice | 2016-10-31 | |
|\| | | | | |||
| * | | | | Merge branch 'master' into rpc_mgr | 2016-10-28 | |
| |\ \ \ \ | |||
| | | | * \ | Merge github.com:grpc/grpc into pid_ctl | 2016-10-28 | |
| | | | |\ \ | | | |_|/ / | | |/| | | | |||
| * | | | | | Merge branch 'master' into rpc_mgr | 2016-10-27 | |
| |\ \ \ \ \ | |||
* | \ \ \ \ \ | Merge branch 'buffer_pools_for_realsies' into grpc_slice | 2016-10-26 | |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| * | | | | | | Merge github.com:grpc/grpc into buffer_pools_for_realsies | 2016-10-26 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||
* | / | | | | | Generate build files | 2016-10-26 | |
|/ / / / / / |