Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | Handshaker plugin mechanism. | Mark D. Roth | 2017-01-06 | |
| | | | | | ||||
| | | * | | Merge remote-tracking branch 'upstream/master' into ↵ | Mark D. Roth | 2017-01-06 | |
| | | |\ \ | | |_|/ / | |/| | | | | | | | | revert-9063-revert-8951-revert-8949-revert-8922-slice_cleanup | |||
| * | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 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 branch 'flow_control_v2' into bwest | Craig Tiller | 2016-12-27 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||
| | | * | | | Merge branch 'slice_with_exec_ctx' into metadata_filter | Craig Tiller | 2016-12-27 | |
| | | |\ \ \ | | | |/ / / | | |/| | | | ||||
| | * | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-27 | |
| | |\ \ \ \ | | |/ / / / | |/| | | | | ||||
| * | | | | | v1.0.x → master upmerge | Nathaniel Manista | 2016-12-16 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manual changes: - Fixed use of Exception.message in _invalid_metadata_test.py - Fixed merge of one_failed_as_unavailable in rpc_server_spec.rb - Added "set -e" to generate_build_additions.sh | |||
| | | | * \ \ | Merge branch 'slice_with_exec_ctx' into metadata_filter | Craig Tiller | 2016-12-12 | |
| | | | |\ \ \ | | | | |/ / / | | | |/| | | | ||||
| | | * | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-12 | |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | ||||
| | | | | * | | Revert "Revert "Revert "Revert "Remove redundant includes from string.h and ↵ | Mark D. Roth | 2016-12-12 | |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | tmpfile.h"""" | |||
| * | | | | | 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 | |
| | | |\ \ \ | | |_|/ / / | |/| | | | | ||||
| | | | * | | Merge branch 'slice_interning' into metadata_filter | Craig Tiller | 2016-12-06 | |
| | | | |\ \ | ||||
| | | | | * \ | Merge branch 'slice_with_exec_ctx' into slice_interning | Craig Tiller | 2016-12-06 | |
| | | | | |\ \ | | | | |_|/ / | | | |/| | | | ||||
| | | * | | | | 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 remote-tracking branch 'upstream/master' into cares_buildin | Yuchen Zeng | 2016-11-30 | |
| | | | | | | |\ | | | |_|_|_|_|/ | | |/| | | | | | ||||
| | | * | | | | | update ruby protbuf dep to 3.1.0 | Alex Polcyn | 2016-11-30 | |
| | | | | | | | | ||||
| | | | | * | | | Merge branch 'slice_interning' into metadata_filter | Craig Tiller | 2016-11-30 | |
| | | | | |\| | | ||||
| | | | | | * | | Merge branch 'slice_with_exec_ctx' into slice_interning | Craig Tiller | 2016-11-30 | |
| | | | | | |\ \ | | | | | |_|/ / | | | | |/| | | | ||||
| | | | * | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-11-30 | |
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||
| * | | | | | | | Merge branch 'security_handshaker1' into security_handshaker2 | Mark D. Roth | 2016-11-29 | |
| |\| | | | | | | ||||
| | * | | | | | | use thread pool from v1.0.x but keep server call life cycle in master | Alexander Polcyn | 2016-11-23 | |
| | | | | | | | | ||||
| | | | | * | | | Merge branch 'slice_with_exec_ctx' into eliminate_mdstr | Craig Tiller | 2016-11-18 | |
| | | | | |\ \ \ | | | | | |/ / / | | | | |/| | | | ||||
| | | | * | | | | 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 branch 'slice_interning' into eliminate_mdstr | Craig Tiller | 2016-11-16 | |
| | | | | |\| | | ||||
| | | | | | * | | Merge branch 'slice_with_exec_ctx' into slice_interning | Craig Tiller | 2016-11-16 | |
| | | | | | |\ \ | | | | | |_|/ / | | | | |/| | | | ||||
| | | | * | | | | 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 | |||
| | | | | | | * | | | Progress towards mdstr elimination | Craig Tiller | 2016-11-10 | |
| | | | | | | |/ / | ||||
| | | | | | | * | | Merge branch 'slice_with_exec_ctx' into slice_interning | Craig Tiller | 2016-11-10 | |
| | | | | | | |\ \ | | | | | | | |/ / | | | | | | |/| | | ||||
| | | | | | * | | | Fix foward declaration duplication | Craig Tiller | 2016-11-10 | |
| | |_|_|_|/ / / | |/| | | | | | | ||||
| | | | | | * | | First pass of slice interning facilities | Craig Tiller | 2016-11-10 | |
| | |_|_|_|/ / | |/| | | | | | ||||
| | | | * | | | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-08 | |
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | ||||
| | | | | | * | Merge remote-tracking branch 'upstream/master' into cares_buildin | Yuchen Zeng | 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 remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-07 | |
| | | | |\ \ \ | | | |_|/ / / | | |/| | | | | ||||
| | | | * | | | Rename method_config.[ch] to service_config.[ch]. | Mark D. Roth | 2016-11-03 | |
| | | | | | | |