aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAge
* Merge pull request #11093 from ctiller/c++compat4Gravatar Craig Tiller2017-05-18
|\
* \ Merge pull request #11026 from markdroth/grpclb_drop_altGravatar Mark D. Roth2017-05-18
|\ \
* \ \ Merge pull request #11198 from stanley-cheung/upmerge-v1_3_2-to-masterGravatar Stanley Cheung2017-05-18
|\ \ \
* \ \ \ Merge pull request #11156 from jtattermusch/csharp_only_blittableGravatar Jan Tattermusch2017-05-18
|\ \ \ \
* \ \ \ \ Merge pull request #11201 from yang-g/debugGravatar Yang Gao2017-05-17
|\ \ \ \ \
| | | * | | Fixed missed conflicts - use constants.logVerbosity insteadGravatar Stanley Cheung2017-05-17
* | | | | | Merge pull request #11174 from stanley-cheung/php-fix-c-ext-versionGravatar Stanley Cheung2017-05-17
|\ \ \ \ \ \
| | | | * | | Upmerge from v1.3.x branch to masterGravatar Stanley Cheung2017-05-17
| |_|_|/| | | |/| | | | | |
| | * | | | | Unref pending events under cq lockGravatar yang-g2017-05-17
* | | | | | | Merge pull request #11118 from muxi/backward-compat-devGravatar Muxi Yan2017-05-17
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge pull request #11098 from dgquintas/fix_subchannel_stuffsGravatar David G. Quintas2017-05-17
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge pull request #11192 from ctiller/compare-a-lagoGravatar Craig Tiller2017-05-17
|\ \ \ \ \ \ \ \ \
| | | | * | | | | | PHP: fix pecl extension reported versionGravatar Stanley Cheung2017-05-17
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #11173 from stanley-cheung/php-split-protobuf-depGravatar Stanley Cheung2017-05-17
|\ \ \ \ \ \ \ \ \
| | * | | | | | | | Fix hpack_size testGravatar Craig Tiller2017-05-17
| |/ / / / / / / / |/| | | | | | | |
| | | | | | | * | Implement grpclb drop support.Gravatar Mark D. Roth2017-05-17
| |_|_|_|_|_|/ / |/| | | | | | |
| | | * | | | | Take grpc_workaround_list as parameterGravatar Muxi Yan2017-05-17
* | | | | | | | Merge pull request #11113 from jtattermusch/python_artifact_polling_traceGravatar Jan Tattermusch2017-05-17
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| | * | | | | | PHP: stop requiring google/protobuf PHP implementationGravatar Stanley Cheung2017-05-16
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #10897 from ctiller/serve_friesGravatar Craig Tiller2017-05-16
|\ \ \ \ \ \ \
| | | | | * | | dont use non-blittable types in native method signaturesGravatar Jan Tattermusch2017-05-16
| |_|_|_|/ / / |/| | | | | |
| | | | * | | Merge remote-tracking branch 'upstream/master' into backward-compat-devGravatar Muxi Yan2017-05-16
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | |
| | | | * | | obsolete -> is obsoleteGravatar Muxi Yan2017-05-16
* | | | | | | Merge pull request #11138 from grpc/revert-11121-revert-10849-backward-compatGravatar Muxi Yan2017-05-16
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge pull request #11000 from lyuxuan/poll_statGravatar lyuxuan2017-05-16
|\ \ \ \ \ \ \ \
| | | | * | | | | regenerate projectsGravatar Jan Tattermusch2017-05-16
| | | | * | | | | fix python artifact buildGravatar Jan Tattermusch2017-05-16
| |_|_|/ / / / / |/| | | | | | |
| | | | | | * | Bump to version 1.3.3Gravatar Ken Payson2017-05-16
* | | | | | | | Merge pull request #10800 from kpayson64/fix_alpineGravatar kpayson642017-05-16
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge pull request #11087 from kpayson64/update_python_authGravatar kpayson642017-05-15
|\ \ \ \ \ \ \ \ \
| | | * | | | | | | fix extern c locationGravatar Yuxuan Li2017-05-15
* | | | | | | | | | Merge pull request #11080 from per-gron/flatbuffer-compatibilityGravatar Yang Gao2017-05-15
|\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | fix last mergeGravatar Yuxuan Li2017-05-15
| | | | * | | | | | | fix mergeGravatar Yuxuan Li2017-05-15
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ merge master, resolve conflictGravatar Yuxuan Li2017-05-15
| | | | |\ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| | | | | | * | | | | | Revert "Revert "Implement Server Backward Compatibility""Gravatar Muxi Yan2017-05-15
| |_|_|_|_|/ / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #10662 from sreecha/cq_mpsc_basedGravatar Sree Kuchibhotla2017-05-15
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge pull request #11115 from jtattermusch/revamp_artifactsGravatar Jan Tattermusch2017-05-15
|\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix clang-format issueGravatar Per Grön2017-05-14
* | | | | | | | | | | | | Merge pull request #11076 from dgquintas/epoll_error_static_stringGravatar David G. Quintas2017-05-12
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/grpc/grpc into importGravatar Nicolas "Pixel" Noble2017-05-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Revert "Implement Server Backward Compatibility"Gravatar Nicolas Noble2017-05-12
* | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into importGravatar Nicolas "Pixel" Noble2017-05-12
|\| | | | | | | | | | | | | |
| | | | | | | | | | | | * | | Merge branch 'master' into backward-compat-devGravatar Muxi Yan2017-05-12
| | | | | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge pull request #10849 from muxi/backward-compatGravatar Muxi Yan2017-05-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ Merge github.com:grpc/grpc into serve_friesGravatar Craig Tiller2017-05-12
| | | | | | | | | | | |\ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into importGravatar Nicolas "Pixel" Noble2017-05-12
|\| | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | Update Python interop tests to use google-auth packageGravatar Ken Payson2017-05-12
| * | | | | | | | | | | | | | | Merge pull request #11104 from yang-g/generic_deadline_propagationGravatar Yang Gao2017-05-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/grpc/grpc into importGravatar Nicolas "Pixel" Noble2017-05-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \