Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-15 |
|\ | |||
| * | Merge pull request #9109 from jtattermusch/protoc_artifacts_fix | Jan Tattermusch | 2016-12-15 |
| |\ | |||
| * \ | Merge pull request #7913 from y-zeng/cli_parse | Yuchen Zeng | 2016-12-14 |
| |\ \ | |||
| * \ \ | Merge pull request #9098 from y-zeng/grpc_context_traffic | Yuchen Zeng | 2016-12-14 |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #9095 from soltanmm-google/rushing-is-not-always-a-good-idea | Masood Malekghassemi | 2016-12-14 |
| |\ \ \ \ | |||
| | | | * | | Add parse, tobinary, totext commands | Yuchen Zeng | 2016-12-14 |
| | |_|/ / | |/| | | | |||
| | * | | | Patch overlooked strings from Python un-namespacing | Masood Malekghassemi | 2016-12-14 |
* | | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-14 |
|\| | | | | |||
| | | | * | fix building protoc artifacts on linux | Jan Tattermusch | 2016-12-14 |
| | |_|/ | |/| | | |||
| * | | | Merge pull request #9061 from jtattermusch/csharp_generated_arg_comments | Jan Tattermusch | 2016-12-14 |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #9060 from jtattermusch/csharp_protoc_leading_space | Jan Tattermusch | 2016-12-14 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge pull request #9089 from dgquintas/short_deadlines_sans_tests | David G. Quintas | 2016-12-13 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||
| | | | | * | Add GRPC_CONTEXT_TRAFFIC in grpc_context_index | Yuchen Zeng | 2016-12-13 |
| | |_|_|/ | |/| | | | |||
| * | | | | Merge pull request #8831 from ryanvo/examples-typo-patch | David G. Quintas | 2016-12-13 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge pull request #9006 from kpayson64/revert_bizarre_api | kpayson64 | 2016-12-13 |
| |\ \ \ \ \ | |||
| | | | * | | | Short deadlines: set Status on deadline | David Garcia Quintas | 2016-12-13 |
| | | | | | * | Generate param comments in C# proto plugin | Jan Tattermusch | 2016-12-13 |
| | | | | | * | remove leading space in C# comments | Jan Tattermusch | 2016-12-13 |
| | |_|_|_|/ | |/| | | | | |||
| | | | | * | remove leading space in C# comments | Jan Tattermusch | 2016-12-13 |
| | |_|_|/ | |/| | | | |||
| * | | | | Merge pull request #9071 from soltanmm-google/taking-tradition-as-law-is-a-da... | Masood Malekghassemi | 2016-12-12 |
| |\ \ \ \ | |||
| | * | | | | Recover 'namespace'd Python distribution packages | Masood Malekghassemi | 2016-12-12 |
| * | | | | | Merge pull request #9078 from grpc/revert-8893-reduce_cq | Craig Tiller | 2016-12-12 |
| |\ \ \ \ \ | |||
| | * | | | | | Revert "Reduce memory bloat (each server cq is very expensive)" | Craig Tiller | 2016-12-12 |
| |/ / / / / | |||
| * | | | | | Merge pull request #8893 from sreecha/reduce_cq | Sree Kuchibhotla | 2016-12-12 |
| |\ \ \ \ \ | |||
| | | * | | | | Un-namespace Python packages | Masood Malekghassemi | 2016-12-12 |
| | |/ / / / | |/| | | | | |||
* | | | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-12 |
|\| | | | | | |||
| * | | | | | Merge pull request #9062 from grpc/revert-9019-short_deadlines | Craig Tiller | 2016-12-12 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge pull request #9063 from grpc/revert-8951-revert-8949-revert-8922-slice_... | Craig Tiller | 2016-12-12 |
| |\ \ \ \ \ \ | |||
| | * | | | | | | Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h""" | Craig Tiller | 2016-12-12 |
| |/ / / / / / | |||
| | * / / / / | Revert "Handle (and test) short call deadlines" | Craig Tiller | 2016-12-12 |
| |/ / / / / | |||
* | | | | | | Fix merge error | Craig Tiller | 2016-12-12 |
* | | | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-12 |
|\| | | | | | |||
| * | | | | | Merge pull request #9026 from jtattermusch/protobuf_consistent_cmake | Jan Tattermusch | 2016-12-12 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge pull request #9028 from jtattermusch/remove_releasesigned_config | Jan Tattermusch | 2016-12-12 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge pull request #9055 from randvis/patch-1 | Craig Tiller | 2016-12-11 |
| |\ \ \ \ \ \ \ | |||
| | * | | | | | | | Fix the incorrect number of states | randvis | 2016-12-12 |
| |/ / / / / / / | |||
| | | | * | | | | Merge branch 'master' into reduce_cq | Sree Kuchibhotla | 2016-12-09 |
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #8797 from sreecha/pss_pi | David G. Quintas | 2016-12-09 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge pull request #9019 from dgquintas/short_deadlines | David G. Quintas | 2016-12-09 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge pull request #9043 from kpayson64/service_rpchandler | kpayson64 | 2016-12-09 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||
| | * | | | | | | | | Add ServiceRpcHandler to exported names | Ken Payson | 2016-12-09 |
| |/ / / / / / / / | |||
| | * / / / / / / | Short deadlines: set Status on deadline | David Garcia Quintas | 2016-12-09 |
| |/ / / / / / / | |||
| * | | | | | | | Merge pull request #8940 from yang-g/cli | Yang Gao | 2016-12-09 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge pull request #8979 from markdroth/handshaker_cleanup | Mark D. Roth | 2016-12-09 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge pull request #8951 from grpc/revert-8949-revert-8922-slice_cleanup | Mark D. Roth | 2016-12-09 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #8980 from markdroth/handshaker_early_exit | Mark D. Roth | 2016-12-09 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge pull request #8742 from kpayson64/service_names_hint | kpayson64 | 2016-12-09 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #8745 from kpayson64/sigpipe_handle | kpayson64 | 2016-12-09 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into revert-8949-revert-8922-s... | Mark D. Roth | 2016-12-09 |
| | | | | |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | Merge pull request #9027 from jtattermusch/run_tests_windows_output | Jan Tattermusch | 2016-12-09 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |