Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #10897 from ctiller/serve_fries | Craig Tiller | 2017-05-16 |
|\ | |||
* | | Revert "Revert "Implement Server Backward Compatibility"" | Muxi Yan | 2017-05-15 |
* | | 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 |
| |\ \ | |||
* | | | | Merge branch 'master' into cq_mpsc_based | Sree Kuchibhotla | 2017-05-10 |
|\| | | | |||
| * | | | Add static assert to enforce subtype invariant | ncteisen | 2017-05-10 |
| | * | | Merge branch 'master' into cq_limited_pollers | Sree Kuchibhotla | 2017-05-05 |
| | |\ \ | |||
| * | \ \ | Merge branch 'master' of https://github.com/grpc/grpc into serialization-refa... | ncteisen | 2017-05-05 |
| |\ \ \ \ | | | |/ / | | |/| | | |||
| | * | | | Merge pull request #10912 from dgquintas/trying-to-fix-stuff | David G. Quintas | 2017-05-04 |
| | |\ \ \ | |||
| | * | | | | Make sure we set deadline for the LB call even without a pick. | Mark D. Roth | 2017-05-03 |
* | | | | | | 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 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 |
| |\ \ \ \ \ | |||
| | | | | * \ | Merge branch 'master' into cq_limited_pollers | Sree Kuchibhotla | 2017-04-28 |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | |||
| | * | | | | | Removed 3rd party dep on thrift | David Garcia Quintas | 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 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge pull request #10427 from ctiller/c++lame | Craig Tiller | 2017-04-27 |
| |\ \ \ \ \ \ | |||
| | | | | | | * | 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 |
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
| | * | | | | | | more TLS cleanup. | Julien Boeuf | 2017-04-26 |
| |/ / / / / / | |||
| * | | | | | | Use larger block size in proto write | Craig Tiller | 2017-04-26 |
| | | | | | * | Merge branch 'master' into cq_limited_pollers | Sree Kuchibhotla | 2017-04-25 |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | |||
* / | | | | | | Create cq vtable | Sree Kuchibhotla | 2017-04-25 |
|/ / / / / / | |||
* | | | | | | Merge pull request #10644 from MakMukhi/master | MakMukhi | 2017-04-24 |
|\ \ \ \ \ \ | |||
| | * \ \ \ \ | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-24 |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||
| | | * | | | | Copy slices for in-process transports: its no longer safe to just ref | Craig Tiller | 2017-04-21 |
| | | | | | * | Minor changes | Sree Kuchibhotla | 2017-04-21 |
| | | | | | * | Fixed pollers | Sree Kuchibhotla | 2017-04-21 |
| | * | | | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-21 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||
| | | | | * | | Merge branch 'master' of https://github.com/grpc/grpc into serialization-refa... | ncteisen | 2017-04-21 |
| | | | | |\ \ | | | | |_|/ / | | | |/| | | | |||
* | | | | | | | Merge github.com:grpc/grpc into hybrid | Craig Tiller | 2017-04-21 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | | | * | | | Merge github.com:grpc/grpc into framing_costs | Craig Tiller | 2017-04-20 |
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | |||
| * | | | | | | Merge pull request #10761 from ctiller/ubsan | Craig Tiller | 2017-04-20 |
| |\ \ \ \ \ \ | |||
| | | | | * | | | Add flexibility on *which* slice gets reffed | Craig Tiller | 2017-04-20 |
| | | | | * | | | Merge github.com:grpc/grpc into framing_costs | Craig Tiller | 2017-04-20 |
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||
* | | | | | | | | Merge branch 'tsan-c++' into hybrid | Craig Tiller | 2017-04-20 |
|\| | | | | | | | |||
| | * | | | | | | Fix ubsan reported failure | Craig Tiller | 2017-04-20 |
| | | | * | | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-19 |
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||
| * | | | | | | | Merge github.com:grpc/grpc into cpparena | Craig Tiller | 2017-04-19 |
| |\| | | | | | | |||
| | | | | | * | | Add to codegen interface, refactor proto serialization | ncteisen | 2017-04-19 |
| | | |_|_|/ / | | |/| | | | | |||
| | * | | | | | Merge pull request #10682 from yang-g/status_helper | Yang Gao | 2017-04-19 |
| | |\ \ \ \ \ | |||
| | | | | | | * | Add flag to compile gpr with compatibility for musl | murgatroid99 | 2017-04-19 |
* | | | | | | | | Merge github.com:grpc/grpc into hybrid | Craig Tiller | 2017-04-19 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| * | | | | | | | clang-format | Craig Tiller | 2017-04-19 |