Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #10992 from apolcyn/doxygen_cpp_nits | apolcyn | 2017-05-17 |
|\ | | | | | Doxygen cpp nits | ||
* \ | Merge pull request #11118 from muxi/backward-compat-dev | Muxi Yan | 2017-05-17 |
|\ \ | | | | | | | Add Backward compatibility API to C++ | ||
| * | | Take grpc_workaround_list as parameter | Muxi Yan | 2017-05-17 |
| | | | |||
* | | | Merge pull request #10897 from ctiller/serve_fries | Craig Tiller | 2017-05-16 |
|\ \ \ | | | | | | | | | Switch default CQ count for thread manager to num_cpus | ||
| | * | | Add /doc/workarounds.md | Muxi Yan | 2017-05-16 |
| | | | | |||
| | * | | Merge remote-tracking branch 'upstream/master' into backward-compat-dev | Muxi Yan | 2017-05-16 |
| | |\ \ | |_|/ / |/| | | | |||
* | | | | Revert "Revert "Implement Server Backward Compatibility"" | Muxi Yan | 2017-05-15 |
| | | | | |||
| | | * | address comments, description changes | Alexander Polcyn | 2017-05-15 |
| | | | | |||
| | * | | Merge branch 'master' into backward-compat-dev | Muxi Yan | 2017-05-12 |
| | |\ \ | |||
| | | * \ | Merge pull request #10849 from muxi/backward-compat | Muxi Yan | 2017-05-12 |
| | | |\ \ | | | | | | | | | | | | | Implement Server Backward Compatibility | ||
| | | | | * | format changes, address comments | Alexander Polcyn | 2017-05-11 |
| | | | | | | |||
* | | | | | | Merge branch 'master' into cq_mpsc_based | Sree Kuchibhotla | 2017-05-11 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||
| | * | | | | Merge github.com:grpc/grpc into serve_fries | Craig Tiller | 2017-05-11 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Merge pull request #11010 from ctiller/uberpoll | Craig Tiller | 2017-05-11 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Roll up of all new polling engines | ||
* | | | | | | | Merge branch 'master' into cq_mpsc_based | Sree Kuchibhotla | 2017-05-10 |
|\| | | | | | | |||
| | | | | | * | fix bad line breaks and lengths | Alexander Polcyn | 2017-05-10 |
| | | | | | | | |||
| | | | | | * | address comments, format changes | Alexander Polcyn | 2017-05-10 |
| | | | | | | | |||
| | | | | * | | sanity fix | Muxi Yan | 2017-05-10 |
| | | | | | | | |||
| * | | | | | | Add static assert to enforce subtype invariant | ncteisen | 2017-05-10 |
| | | | | | | | |||
| | | | | * | | clang-format | Muxi Yan | 2017-05-09 |
| | | | | | | | |||
| | | | | * | | Fix argument string | Muxi Yan | 2017-05-09 |
| | | | | | | | |||
| | | | * | | | Use AddChannelArgument method | Muxi Yan | 2017-05-09 |
| | | | | | | | |||
| | | | * | | | bug fixes | Muxi Yan | 2017-05-09 |
| | | | | | | | |||
| | | | * | | | Add EnableWorkaround API to enable server workarounds | Muxi Yan | 2017-05-09 |
| | | | |/ / | |||
| | | | * | | Add comment | Muxi Yan | 2017-05-09 |
| | | | | | | |||
| | | | * | | Put workaround list somewhere accessable by wrapping languages | Muxi Yan | 2017-05-09 |
| | | | | | | |||
| | | | | * | address comments | Alexander Polcyn | 2017-05-09 |
| | | | | | | |||
| | | | | * | address comments | Alexander Polcyn | 2017-05-05 |
| | | | | | | |||
| | | | * | | Merge remote-tracking branch 'upstream/master' into backward-compat | Muxi Yan | 2017-05-05 |
| | | | |\ \ | |||
| | * | | \ \ | Merge branch 'master' into cq_limited_pollers | Sree Kuchibhotla | 2017-05-05 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||
| | | | | | * | cpp doc nits | Alexander Polcyn | 2017-05-05 |
| | | | | | | | |||
| * | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into ↵ | ncteisen | 2017-05-05 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | serialization-refactor | ||
| | * | | | | | Merge pull request #10912 from dgquintas/trying-to-fix-stuff | David G. Quintas | 2017-05-04 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Upmerge from 1.3.0 to master | ||
| | * | | | | | | Make sure we set deadline for the LB call even without a pick. | Mark D. Roth | 2017-05-03 |
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | As part of this, get the deadline from a channel arg instead of pick_args. | ||
* | | | | | | | Merge branch 'master' into cq_mpsc_based | Sree Kuchibhotla | 2017-05-03 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| * | | | | | | Reintroduce a lambda capture as part of C++11-izing code | Vijay Pai | 2017-05-01 |
| | | | | | | | |||
| | | | | * | | Merge github.com:grpc/grpc into serve_fries | Craig Tiller | 2017-05-01 |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | |||
| | | | | | * | Merge remote-tracking branch 'upstream/master' into backward-compat | Muxi Yan | 2017-04-30 |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | |||
| | | * | | | | Merge branch 'v1.3.x' into master-upmerge-v1.3.x | David Garcia Quintas | 2017-04-28 |
| | |/| | | | | |/| | | | | | |||
| * | | | | | | Merge pull request #10911 from dgquintas/remove_thrift | David G. Quintas | 2017-04-28 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Removed 3rd party dep on thrift | ||
| | | | | * \ \ | Merge branch 'master' into cq_limited_pollers | Sree Kuchibhotla | 2017-04-28 |
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||
| | * | | | | | | Removed 3rd party dep on thrift | David Garcia Quintas | 2017-04-28 |
| | | | | | | | | |||
| | | | | | | * | Use channel arg to enable workaround | Muxi Yan | 2017-04-28 |
| | | | | | | | | |||
| | | | | | * | | Ensure at least one cq | Craig Tiller | 2017-04-27 |
| | | | | | | | | |||
| | | | | | * | | Increase default CQ count from 1 to num_cpus | Craig Tiller | 2017-04-27 |
| | |_|_|_|/ / | |/| | | | | | |||
| * | | | | | | Merge pull request #10613 from ctiller/framing_costs | Craig Tiller | 2017-04-27 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Optimize framing a little | ||
| * \ \ \ \ \ \ | Merge pull request #10427 from ctiller/c++lame | Craig Tiller | 2017-04-27 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Convert Lame Client Channel code to C++ | ||
| | | | | | | * \ | Merge branch 'master' into cq_limited_pollers | Sree Kuchibhotla | 2017-04-26 |
| | | | | | | |\ \ | | | | | |_|_|/ / | | | | |/| | | | | |||
* | | | | | | | | | Merge branch 'master' into cq_mpsc_based | Sree Kuchibhotla | 2017-04-26 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||
| | | * | | | | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-26 |
| | | |\ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | |