Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #8235 from ctiller/adjustable_window | Nicolas Noble | 2016-09-29 |
|\ | | | | | Make initial connect retry backoff configurable | ||
* \ | Merge pull request #8238 from nicolasnoble/master-upmerge-from-deep-under | Nicolas Noble | 2016-09-29 |
|\ \ | | | | | | | Upmerge from 1.0.x | ||
| | * | Merge github.com:grpc/grpc into adjustable_window | Craig Tiller | 2016-09-29 |
| | |\ | |_|/ |/| | | |||
* | | | Merge pull request #8046 from gislan/master | Yang Gao | 2016-09-29 |
|\ \ \ | | | | | | | | | Add method for creating insecure channel from FD with custom arguments using C++ API. | ||
| | | * | Merge pull request #36 from muxi/adjustable_window_objc | Craig Tiller | 2016-09-29 |
| | | |\ | | | | | | | | | | | Clean up code | ||
| | * | | | Format. | Nicolas "Pixel" Noble | 2016-09-29 |
| | | | | | |||
| | | | * | Clean up code | Muxi Yan | 2016-09-29 |
| | | | | | |||
* | | | | | Merge pull request #7833 from sreecha/fix_channel_from_fd_api | Nicolas Noble | 2016-09-29 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove completion queue parameter from `grpc_server_add_insecure_channel_from_fd` API | ||
* \ \ \ \ \ | Merge pull request #8224 from sreecha/grpc_signal | Nicolas Noble | 2016-09-29 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use SIGMINRT + 6 as the default signal for gRPC epoll engine (instead of SIGMINRT + 2) | ||
| | | | * \ \ | Merge branch 'master' of https://github.com/grpc/grpc into ↵ | Nicolas "Pixel" Noble | 2016-09-29 |
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | master-upmerge-from-deep-under | ||
* | | | | | | | Merge pull request #7970 from markdroth/deadline_filter | Nicolas Noble | 2016-09-29 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Move deadline functionality into filters. | ||
* \ \ \ \ \ \ \ | Merge pull request #8203 from dgquintas/nanopb_fuzzer_squelch | David G. Quintas | 2016-09-29 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Prevent nanopb fuzzers from spamming logs | ||
| | * | | | | | | | Ran generate_projects.sh. | Mark D. Roth | 2016-09-29 |
| | | | | | | | | | |||
| | | | | | | * | | Merge pull request #35 from muxi/adjustable_window_objc | Craig Tiller | 2016-09-28 |
| | | | | | | |\| | | | | | | | | | | | | | | | | | | | Set initial backoff to 10000ms when creating channel in Objective C | ||
| | | | | | | | * | Set initial backoff to 10000ms when creating channel | Muxi Yan | 2016-09-28 |
| | | | | | | |/ | |||
| | | | | | * | | Merge remote-tracking branch 'google/v1.0.x' into master-upmerge-from-deep-under | Nicolas "Pixel" Noble | 2016-09-29 |
| | | | | | |\ \ | |||
| | | | | | | * \ | Merge pull request #8237 from nicolasnoble/memleak | Nicolas Noble | 2016-09-28 |
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | Plugging memory leak. | ||
| | | | | | * | | | | Merge remote-tracking branch 'google/v1.0.x' into master-upmerge-from-deep-under | Nicolas "Pixel" Noble | 2016-09-29 |
| |_|_|_|_|/| | | | |/| | | | | |/ / / | |||
| | | | | | | * / | Plugging memory leak. | Nicolas "Pixel" Noble | 2016-09-29 |
| | | | | | |/ / | |||
| | | | | | | * | Fix copy/paste bug | Craig Tiller | 2016-09-28 |
| | | | | | | | | |||
| | | | | | * | | Merge pull request #8184 from nicolasnoble/nanopb-code-drop | Nicolas Noble | 2016-09-28 |
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | Nanopb code drop | ||
| | | | | | | | * | Make initial connect retry backoff configurable | Craig Tiller | 2016-09-28 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-28 |
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||
* | | | | | | | | Merge pull request #8185 from y-zeng/gen_proto_comment | Yuchen Zeng | 2016-09-28 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Improve gen_reflection_proto.sh | ||
* \ \ \ \ \ \ \ \ | Merge pull request #8168 from markdroth/max_message_size_fix | Nicolas Noble | 2016-09-28 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Set default max send message size to unlimited. | ||
* \ \ \ \ \ \ \ \ \ | Merge pull request #8221 from dgquintas/grpclb_server_name_const | Nicolas Noble | 2016-09-28 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Add comments documenting ownership semantics | ||
| | | | | * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-28 |
| | | | | |\ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | |||
* | | | | | | | | | | | Merge pull request #8191 from markdroth/subchannel_factory_cleanup | Mark D. Roth | 2016-09-28 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused files. | ||
| | * | | | | | | | | | | Added comments wrt lb/subchannel args ownership. | David Garcia Quintas | 2016-09-28 |
| | | | | | | | | | | | | |||
* | | | | | | | | | | | | Merge pull request #8192 from dgquintas/resolver_prefix | David G. Quintas | 2016-09-28 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrote handling of default resolver prefix | ||
* \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #8183 from dgquintas/grpclb_deadline | David G. Quintas | 2016-09-28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | Changed deadline of internal LB channel. | ||
| | | | | | | | * | | | | | Regenerate tests.json since it was out of sync | Sree Kuchibhotla | 2016-09-27 |
| | | | | | | | | | | | | | |||
| | | | | | | | * | | | | | Use SIGMINRT + 6 as the default signal for gRPC epoll engine | Sree Kuchibhotla | 2016-09-27 |
| |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | Merge pull request #8218 from ctiller/reduce_load | Nicolas Noble | 2016-09-27 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce load on Jenkins from running benchmarks as tests | ||
| * | | | | | | | | | | | | Dont run benchmarks outside of linux for now | Craig Tiller | 2016-09-27 |
| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | Reduce # of benchmarks run as Jenkins unit tests | Craig Tiller | 2016-09-27 |
|/ / / / / / / / / / / / | |||
* | | | | | | | | | | | | Merge pull request #7930 from yang-g/header2 | Nicolas Noble | 2016-09-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a header to override grpc::string when needed | ||
* \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7928 from yang-g/void_cast | Nicolas Noble | 2016-09-26 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent some compilers compaining unused return value | ||
| | | | * | | | | | | | | | | PR comments | David Garcia Quintas | 2016-09-26 |
| | | | | | | | | | | | | | | |||
| | | | | | | | * | | | | | | Prevent nanopb fuzzers from spamming logs | David Garcia Quintas | 2016-09-26 |
| |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |||
| | | | * | | | | | | | | | Rewrote handling of default resolver prefix | David Garcia Quintas | 2016-09-23 |
| |_|_|/ / / / / / / / / |/| | | | | | | | | | | | |||
| | | | * | | | | | | | | Remove unused files. | Mark D. Roth | 2016-09-23 |
| |_|_|/ / / / / / / / |/| | | | | | | | | | | |||
| | | | | * | | | | | | Fix typo | Yuchen Zeng | 2016-09-23 |
| | | | | | | | | | | | |||
| | | | | | | | | * | | Merge pull request #8033 from thunderboltsid/add_deprecation_docstrings | Nathaniel Manista | 2016-09-23 |
| | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Added deprecation-describing doc strings to generated beta elements. | ||
| | | | | | * | | | \ \ | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-23 |
| | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | Merge pull request #7611 from markdroth/http_connect | Mark D. Roth | 2016-09-23 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTP CONNECT handshaker | ||
| | | | | * | | | | | | | | clang-format | Mark D. Roth | 2016-09-23 |
| | | | | | | | | | | | | | |||
| | | | | | * | | | | | | | Check protoc and grpc_cpp_plugin | Yuchen Zeng | 2016-09-22 |
| | | | | | | | | | | | | | |||
| | | | | | | | | | | | * | Removing sanity check. | Nicolas "Pixel" Noble | 2016-09-23 |
| | | | | | | | | | | | | | |||
| | | | | | | | | | | | * | Putting nanopb files into third_party without being a submodule. | Nicolas "Pixel" Noble | 2016-09-23 |
| | | | | | | | | | | | | |