Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | | | | | | Merge pull request #11174 from stanley-cheung/php-fix-c-ext-version | Stanley Cheung | 2017-05-17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | Upmerge from v1.3.x branch to master | Stanley Cheung | 2017-05-17 | |
| |_|_|/| | | | | | | | | | | |/| | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | Unref pending events under cq lock | yang-g | 2017-05-17 | |
* | | | | | | | | | | | | | | | Merge pull request #11118 from muxi/backward-compat-dev | Muxi Yan | 2017-05-17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #11098 from dgquintas/fix_subchannel_stuffs | David G. Quintas | 2017-05-17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #11192 from ctiller/compare-a-lago | Craig Tiller | 2017-05-17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | | | PHP: fix pecl extension reported version | Stanley Cheung | 2017-05-17 | |
| |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | Merge pull request #11173 from stanley-cheung/php-split-protobuf-dep | Stanley Cheung | 2017-05-17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | | Fix hpack_size test | Craig Tiller | 2017-05-17 | |
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||
| | | | | | | * | | | | | | | | | | Implement grpclb drop support. | Mark D. Roth | 2017-05-17 | |
| |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | Take grpc_workaround_list as parameter | Muxi Yan | 2017-05-17 | |
* | | | | | | | | | | | | | | | | Merge pull request #11113 from jtattermusch/python_artifact_polling_trace | Jan Tattermusch | 2017-05-17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | PHP: stop requiring google/protobuf PHP implementation | Stanley Cheung | 2017-05-16 | |
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | Merge pull request #10897 from ctiller/serve_fries | Craig Tiller | 2017-05-16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | | | | | | | | | | * | Rework well_known_protos attr, and some other fixes | Craig Tiller | 2017-05-16 | |
| | | | | | | | | | | * | | | | | Add api to server builder plugin to modify the builder | yang-g | 2017-05-16 | |
| |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | dont use non-blittable types in native method signatures | Jan Tattermusch | 2017-05-16 | |
| |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into backward-compat-dev | Muxi Yan | 2017-05-16 | |
| | | | |\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | obsolete -> is obsolete | Muxi Yan | 2017-05-16 | |
* | | | | | | | | | | | | | | Merge pull request #11138 from grpc/revert-11121-revert-10849-backward-compat | Muxi Yan | 2017-05-16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #11000 from lyuxuan/poll_stat | lyuxuan | 2017-05-16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * | | | | | | | | | | | | regenerate projects | Jan Tattermusch | 2017-05-16 | |
| | | | * | | | | | | | | | | | | fix python artifact build | Jan Tattermusch | 2017-05-16 | |
| |_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||
| | | | | | * | | | | | | | | | Bump to version 1.3.3 | Ken Payson | 2017-05-16 | |
* | | | | | | | | | | | | | | | Merge pull request #10800 from kpayson64/fix_alpine | kpayson64 | 2017-05-16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #11087 from kpayson64/update_python_auth | kpayson64 | 2017-05-15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | fix extern c location | Yuxuan Li | 2017-05-15 | |
* | | | | | | | | | | | | | | | | | Merge pull request #11080 from per-gron/flatbuffer-compatibility | Yang Gao | 2017-05-15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | | | | | | | | | | | | * | Const correctness? for cython | Craig Tiller | 2017-05-15 | |
| | | | * | | | | | | | | | | | | | | fix last merge | Yuxuan Li | 2017-05-15 | |
| | | | * | | | | | | | | | | | | | | fix merge | Yuxuan Li | 2017-05-15 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge master, resolve conflict | Yuxuan Li | 2017-05-15 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||
| | | | | | * | | | | | | | | | | | | | Revert "Revert "Implement Server Backward Compatibility"" | Muxi Yan | 2017-05-15 | |
| |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | Merge pull request #10662 from sreecha/cq_mpsc_based | Sree Kuchibhotla | 2017-05-15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | Merge pull request #11115 from jtattermusch/revamp_artifacts | Jan Tattermusch | 2017-05-15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | | Fix clang-format issue | Per Grön | 2017-05-14 | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #11076 from dgquintas/epoll_error_static_string | David G. Quintas | 2017-05-12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | | | | | | | | | | | * | | | | Remove unnecessary require_relative | Ernie Miller | 2017-05-12 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into import | Nicolas "Pixel" Noble | 2017-05-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | Revert "Implement Server Backward Compatibility" | Nicolas Noble | 2017-05-12 | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into import | Nicolas "Pixel" Noble | 2017-05-12 | |
|\| | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | * | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | | | | | | * \ \ \ \ \ \ \ \ \ | Merge github.com:grpc/grpc into serve_fries | Craig Tiller | 2017-05-12 | |
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into import | Nicolas "Pixel" Noble | 2017-05-12 | |
|\| | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | * | | | | | | | | | | | | | | Update Python interop tests to use google-auth package | Ken Payson | 2017-05-12 | |
| * | | | | | | | | | | | | | | | | | | | | Merge pull request #11104 from yang-g/generic_deadline_propagation | Yang Gao | 2017-05-12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/grpc/grpc into import | Nicolas "Pixel" Noble | 2017-05-12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | * | | | | | | | | | | | | | | | | regenerate | Jan Tattermusch | 2017-05-12 | |
| | | | | | * | | | | | | | | | | | | | | | | adjust package build scripts to new paths | Jan Tattermusch | 2017-05-12 | |
| | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |