Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of https://github.com/grpc/grpc into master-upmerge-fro... | Nicolas "Pixel" Noble | 2016-09-29 |
|\ | |||
* \ | 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 |
| | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-28 |
| | |\ | |_|/ |/| | | |||
* | | | Merge pull request #8168 from markdroth/max_message_size_fix | Nicolas Noble | 2016-09-28 |
|\ \ \ | |||
* \ \ \ | Merge pull request #8221 from dgquintas/grpclb_server_name_const | Nicolas Noble | 2016-09-28 |
|\ \ \ \ | |||
| | | | * | 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 |
|\ \ \ \ \ | |||
| | * | | | | 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 |
|\ \ \ \ \ \ | |||
* \ \ \ \ \ \ | Merge pull request #8183 from dgquintas/grpclb_deadline | David G. Quintas | 2016-09-28 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||
| | * | | | | | PR comments | 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 |
| |/ / / / |/| | | | | |||
| | | | * | 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 |
|\ \ \ \ \ | |||
| | | * | | | clang-format | Mark D. Roth | 2016-09-23 |
| | * | | | | Changed deadline of internal LB channel. | David Garcia Quintas | 2016-09-22 |
| |/ / / / |/| | | | | |||
* | | | | | Merge pull request #8171 from perumaalgoog/perugrpc2 | Nicolas Noble | 2016-09-22 |
|\ \ \ \ \ | |||
| * | | | | | Fix Android CPP Build issues | Perumaal S | 2016-09-22 |
* | | | | | | changed service name for grpclb | David Garcia Quintas | 2016-09-22 |
| * | | | | | Fix Android+CPP build | Perumaal S | 2016-09-22 |
|/ / / / / | |||
| * | | | | Fix asan failure. | Mark D. Roth | 2016-09-22 |
| | * | | | Fix type problems. | Mark D. Roth | 2016-09-22 |
| | * | | | Set default max send message size to unlimited. | Mark D. Roth | 2016-09-22 |
* | | | | | Merge pull request #8099 from dgquintas/census_md_rename_sep_16 | David G. Quintas | 2016-09-21 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||
| | * | | | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-09-21 |
| | |\ \ \ | |_|/ / / |/| | | | | |||
| | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-21 |
| | | | |\ | |_|_|_|/ |/| | | | | |||
* | | | | | Merge pull request #8049 from markdroth/grpclb_resolver_changes2 | Mark D. Roth | 2016-09-21 |
|\ \ \ \ \ | |||
* | | | | | | Sanitize master. | Nicolas "Pixel" Noble | 2016-09-20 |
| * | | | | | Code review changes. | Mark D. Roth | 2016-09-20 |
| * | | | | | Code review changes. | Mark D. Roth | 2016-09-20 |
| | | | | * | Fix message size filter to use close instead of cancel. | Mark D. Roth | 2016-09-20 |
* | | | | | | Merge pull request #8052 from Vizerai/grpc_tracing | Jim King | 2016-09-19 |
|\ \ \ \ \ \ | |||
| | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-19 |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | | |||
* | | | | | | | Merge pull request #7846 from markdroth/max_send_size_filter | Mark D. Roth | 2016-09-19 |
|\ \ \ \ \ \ \ | |||
| | | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-19 |
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | | | |||
| | | | | * | | | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-09-19 |
| | | | | |\ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||
| | | * | | | | | Merge remote-tracking branch 'upstream/master' into grpclb_resolver_changes2 | Mark D. Roth | 2016-09-19 |
| | | |\ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||
* | | | | | | | | Merge pull request #7991 from markdroth/grpclb_resolver_changes | Mark D. Roth | 2016-09-19 |
|\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | Fix Windows printf formatting bug. | Mark D. Roth | 2016-09-19 |
* | | | | | | | | | Merge pull request #8113 from yang-g/verify_auth_headers | Yang Gao | 2016-09-18 |
|\ \ \ \ \ \ \ \ \ | |||
| | | | | | | * \ \ | Merge remote-tracking branch 'upstream/master' into http_connect | Mark D. Roth | 2016-09-16 |
| | | | | | | |\ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||
| | | | | | | * | | | Fix merge problems. | Mark D. Roth | 2016-09-16 |
| | | | | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-16 |
| | | | | | | | | |\ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||
| | | * | | | | | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | Mark D. Roth | 2016-09-16 |
| | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||
| | | | | * | | | | | Merge branch 'grpclb_resolver_changes' into grpclb_resolver_changes2 | Mark D. Roth | 2016-09-16 |
| | | | | |\ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||
| | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into grpclb_resolver_changes | Mark D. Roth | 2016-09-16 |
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||
| | * | | | | | | | | Code review changes. | Mark D. Roth | 2016-09-16 |
* | | | | | | | | | | Merge pull request #8069 from grpc/revert-8068-revert-7279-grand-unified-clos... | Craig Tiller | 2016-09-16 |
|\ \ \ \ \ \ \ \ \ \ |