Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | * | | | | Merge remote-tracking branch 'upstream/master' into backward-compat-dev | 2017-05-16 | ||
| | |\ \ \ \ | |_|/ / / / |/| | | | | | ||||
| | | | | * | Make ServerBuilder accept (dns:///) URIs instead of just dns names | 2017-05-15 | ||
* | | | | | | Revert "Revert "Implement Server Backward Compatibility"" | 2017-05-15 | ||
| |_|_|_|/ |/| | | | | ||||
| | | * | | address comments, description changes | 2017-05-15 | ||
| | * | | | Merge branch 'master' into backward-compat-dev | 2017-05-12 | ||
| | |\ \ \ | ||||
| | | * \ \ | Merge pull request #10849 from muxi/backward-compat | 2017-05-12 | ||
| | | |\ \ \ | ||||
| | | | | * | | format changes, address comments | 2017-05-11 | ||
* | | | | | | | Merge branch 'master' into cq_mpsc_based | 2017-05-11 | ||
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||
| | * | | | | | Merge github.com:grpc/grpc into serve_fries | 2017-05-11 | ||
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||
| * | | | | | | Merge pull request #11010 from ctiller/uberpoll | 2017-05-11 | ||
| |\ \ \ \ \ \ | ||||
* | | | | | | | | Merge branch 'master' into cq_mpsc_based | 2017-05-10 | ||
|\| | | | | | | | ||||
| | | | | | * | | fix bad line breaks and lengths | 2017-05-10 | ||
| | | | | | * | | address comments, format changes | 2017-05-10 | ||
| | | | | * | | | sanity fix | 2017-05-10 | ||
| * | | | | | | | Add static assert to enforce subtype invariant | 2017-05-10 | ||
| | | | | * | | | clang-format | 2017-05-09 | ||
| | | | | * | | | Fix argument string | 2017-05-09 | ||
| | | | * | | | | Use AddChannelArgument method | 2017-05-09 | ||
| | | | * | | | | bug fixes | 2017-05-09 | ||
| | | | * | | | | Add EnableWorkaround API to enable server workarounds | 2017-05-09 | ||
| | | | |/ / / | ||||
| | | | * | | | Add comment | 2017-05-09 | ||
| | | | * | | | Put workaround list somewhere accessable by wrapping languages | 2017-05-09 | ||
| | | | | * | | address comments | 2017-05-09 | ||
| | | | | * | | address comments | 2017-05-05 | ||
| | | | * | | | Merge remote-tracking branch 'upstream/master' into backward-compat | 2017-05-05 | ||
| | | | |\ \ \ | ||||
| | * | | \ \ \ | Merge branch 'master' into cq_limited_pollers | 2017-05-05 | ||
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | ||||
| | | | | | * | | cpp doc nits | 2017-05-05 | ||
| * | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into serialization-refa... | 2017-05-05 | ||
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||
| | * | | | | | | Merge pull request #10912 from dgquintas/trying-to-fix-stuff | 2017-05-04 | ||
| | |\ \ \ \ \ \ | ||||
| | * | | | | | | | Make sure we set deadline for the LB call even without a pick. | 2017-05-03 | ||
| | | |_|_|_|/ / | | |/| | | | | | ||||
* | | | | | | | | Merge branch 'master' into cq_mpsc_based | 2017-05-03 | ||
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||
| * | | | | | | | Reintroduce a lambda capture as part of C++11-izing code | 2017-05-01 | ||
| | | | | * | | | Merge github.com:grpc/grpc into serve_fries | 2017-05-01 | ||
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | | | ||||
| | | | | | * | | Merge remote-tracking branch 'upstream/master' into backward-compat | 2017-04-30 | ||
| | | | | | |\ \ | | |_|_|_|_|/ / | |/| | | | | | | ||||
| | | * | | | | | Merge branch 'v1.3.x' into master-upmerge-v1.3.x | 2017-04-28 | ||
| | |/| | | | | | |/| | | | | | | ||||
| * | | | | | | | Merge pull request #10911 from dgquintas/remove_thrift | 2017-04-28 | ||
| |\ \ \ \ \ \ \ | ||||
| | | | | * \ \ \ | Merge branch 'master' into cq_limited_pollers | 2017-04-28 | ||
| | | | | |\ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | ||||
| | * | | | | | | | Removed 3rd party dep on thrift | 2017-04-28 | ||
| | | | | | | * | | Use channel arg to enable workaround | 2017-04-28 | ||
| | | | | | * | | | Ensure at least one cq | 2017-04-27 | ||
| | | | | | * | | | Increase default CQ count from 1 to num_cpus | 2017-04-27 | ||
| | |_|_|_|/ / / | |/| | | | | | | ||||
| * | | | | | | | Merge pull request #10613 from ctiller/framing_costs | 2017-04-27 | ||
| |\ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ | Merge pull request #10427 from ctiller/c++lame | 2017-04-27 | ||
| |\ \ \ \ \ \ \ \ | ||||
| | | | | | | * \ \ | Merge branch 'master' into cq_limited_pollers | 2017-04-26 | ||
| | | | | | | |\ \ \ | | | | | |_|_|/ / / | | | | |/| | | | | | ||||
* | | | | | | | | | | Merge branch 'master' into cq_mpsc_based | 2017-04-26 | ||
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | ||||
| | | * | | | | | | | Merge github.com:grpc/grpc into c++lame | 2017-04-26 | ||
| | | |\ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | ||||
| | | | | | | | | * | Revert "Merge branch 'master' into v1.3.x" | 2017-04-26 | ||
| | * | | | | | | | | more TLS cleanup. | 2017-04-26 | ||
| |/ / / / / / / / | ||||
| * | | | | | / / | Use larger block size in proto write | 2017-04-26 | ||
| | |_|_|_|_|/ / | |/| | | | | | | ||||
| | | | | | * | | Merge branch 'master' into cq_limited_pollers | 2017-04-25 | ||
| | | | | | |\ \ | | |_|_|_|_|/ / | |/| | | | | | |