Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | 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 | |
|\| | |||
| * | Merge pull request #9062 from grpc/revert-9019-short_deadlines | 2016-12-12 | |
| |\ | | | | | | | Revert "Handle (and test) short call deadlines" | ||
| * | | Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h""" | 2016-12-12 | |
| | | | |||
| | * | Revert "Handle (and test) short call deadlines" | 2016-12-12 | |
| |/ | |||
* | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-12-12 | |
|\| | |||
| * | Short deadlines: set Status on deadline | 2016-12-09 | |
| | | |||
| * | Merge remote-tracking branch 'upstream/master' into ↵ | 2016-12-09 | |
| |\ | | | | | | | | | | revert-8949-revert-8922-slice_cleanup | ||
* | \ | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-12-09 | |
|\ \ \ | | |/ | |/| | |||
| * | | Renamed google_benchmark submodule to benchmark | 2016-12-06 | |
| | | | |||
* | | | 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 | |
| |/ | |||
| * | Merge pull request #8949 from grpc/revert-8922-slice_cleanup | 2016-12-05 | |
| |\ | | | | | | | Revert "Remove redundant includes from string.h and tmpfile.h" | ||
| * | | Revert "Renamed google_benchmark submodule to benchmark" | 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 | ||
| * \ | Merge pull request #8851 from dgquintas/rename_gbench | 2016-12-05 | |
| |\ \ | | | | | | | | | Renamed google_benchmark submodule to benchmark | ||
| * | | | 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 | |
| | | | | |||
| | | * | Renamed google_benchmark submodule to benchmark | 2016-11-23 | |
| | |/ | |/| | |||
* | | | 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 pull request #8617 from markdroth/service_config_json | 2016-11-17 | |
| |\ \ | | | | | | | | | Use JSON tree for service config channel arg. | ||
* | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-11-16 | |
|\| | | | |||
| * | | | Merge github.com:grpc/grpc into bm_fullstack | 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 remote-tracking branch 'upstream/master' into latency_in_final_info | 2016-11-14 | |
| | |\ \ \ | |||
| | | * \ \ | Merge pull request #8335 from y-zeng/tos | 2016-11-11 | |
| | | |\ \ \ | | | | | | | | | | | | | | | Add grpc_socket_mutator | ||
| | | | | | * | Merge remote-tracking branch 'upstream/master' into service_config_json | 2016-11-10 | |
| | | | | | |\ | | | | |_|_|/ | | | |/| | | | |||
* | | | | | | | Fix foward declaration duplication | 2016-11-10 | |
| | | | | | | | |||
| | | * | | | | regenerate projects | 2016-11-09 | |
| | | | | | | | |||
| | | * | | | | Merge remote-tracking branch 'upstream/master' into ssl_fuzzer | 2016-11-09 | |
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | |||
| | | | | | * | Merge remote-tracking branch 'upstream/master' into service_config_json | 2016-11-09 | |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | |||
| | * | | | | | Merge remote-tracking branch 'upstream/master' into latency_in_final_info | 2016-11-09 | |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||
| | | * | | | | Merge remote-tracking branch 'upstream/master' into ssl_fuzzer | 2016-11-08 | |
| | | |\ \ \ \ | |||
* | | | \ \ \ \ | Merge remote-tracking branch 'upstream/master' into ↵ | 2016-11-08 | |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | no-authority-header-in-cronet | ||
| | | | | | | * | Merge remote-tracking branch 'upstream/master' into service_config_json | 2016-11-08 | |
| | | | | | | |\ | | |_|_|_|_|_|/ | |/| | | | | | | |||
| * | | | | | | | Merge pull request #8618 from markdroth/channel_info_api | 2016-11-08 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add API for getting arbitrary state back from a channel | ||
| | | | | * | | | | fix sources_and_headers.json | 2016-11-08 | |
| | | | | | | | | | |||
| | | * | | | | | | Merge github.com:grpc/grpc into bm_fullstack | 2016-11-08 | |
| | | |\ \ \ \ \ \ | |||
| | | | | | | | * | | Remove legacy poller | 2016-11-08 | |
| | | | | |_|_|/ / | | | | |/| | | | | |||
| * | | | | | | | | Merge github.com:grpc/grpc into grpc_slice | 2016-11-08 | |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | |