Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #11093 from ctiller/c++compat4 | 2017-05-18 | |
|\ | | | | | C++ compatibility fixes | ||
* \ | Merge pull request #11026 from markdroth/grpclb_drop_alt | 2017-05-18 | |
|\ \ | | | | | | | Implement grpclb drop support. | ||
* \ \ | Merge pull request #11198 from stanley-cheung/upmerge-v1_3_2-to-master | 2017-05-18 | |
|\ \ \ | | | | | | | | | Upmerge v1.3.x branch to master | ||
* \ \ \ | Merge pull request #11156 from jtattermusch/csharp_only_blittable | 2017-05-18 | |
|\ \ \ \ | | | | | | | | | | | C#: Dont use non-blittable types in native method signatures | ||
* \ \ \ \ | Merge pull request #11201 from yang-g/debug | 2017-05-17 | |
|\ \ \ \ \ | | | | | | | | | | | | | Unref pending events under cq lock | ||
| | | * | | | Fixed missed conflicts - use constants.logVerbosity instead | 2017-05-17 | |
| | | | | | | |||
* | | | | | | Merge pull request #11174 from stanley-cheung/php-fix-c-ext-version | 2017-05-17 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | PHP: fix pecl extension version | ||
| | | | * | | | Upmerge from v1.3.x branch to master | 2017-05-17 | |
| |_|_|/| | | |/| | | | | | | |||
| | * | | | | | Unref pending events under cq lock | 2017-05-17 | |
| | | | | | | | |||
* | | | | | | | Merge pull request #11118 from muxi/backward-compat-dev | 2017-05-17 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add Backward compatibility API to C++ | ||
* \ \ \ \ \ \ \ | Merge pull request #11098 from dgquintas/fix_subchannel_stuffs | 2017-05-17 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixes to subchannel and its index | ||
* \ \ \ \ \ \ \ \ | Merge pull request #11192 from ctiller/compare-a-lago | 2017-05-17 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix hpack_size test | ||
| | | | * | | | | | | PHP: fix pecl extension reported version | 2017-05-17 | |
| |_|_|/ / / / / / |/| | | | | | | | | |||
* | | | | | | | | | Merge pull request #11173 from stanley-cheung/php-split-protobuf-dep | 2017-05-17 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | PHP: stop requiring google/protobuf PHP implementation | ||
| | * | | | | | | | | Fix hpack_size test | 2017-05-17 | |
| |/ / / / / / / / |/| | | | | | | | | |||
| | | | | | | * | | Implement grpclb drop support. | 2017-05-17 | |
| |_|_|_|_|_|/ / |/| | | | | | | | |||
| | | * | | | | | Take grpc_workaround_list as parameter | 2017-05-17 | |
| | | | | | | | | |||
* | | | | | | | | Merge pull request #11113 from jtattermusch/python_artifact_polling_trace | 2017-05-17 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | Try fixing python artifact build on Windows | ||
| | * | | | | | | PHP: stop requiring google/protobuf PHP implementation | 2017-05-16 | |
| |/ / / / / / |/| | | | | | | |||
* | | | | | | | Merge pull request #10897 from ctiller/serve_fries | 2017-05-16 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Switch default CQ count for thread manager to num_cpus | ||
| | | | | * | | | dont use non-blittable types in native method signatures | 2017-05-16 | |
| |_|_|_|/ / / |/| | | | | | | |||
| | | | * | | | Merge remote-tracking branch 'upstream/master' into backward-compat-dev | 2017-05-16 | |
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | | | |||
| | | | * | | | obsolete -> is obsolete | 2017-05-16 | |
| | | | | | | | |||
* | | | | | | | Merge pull request #11138 from grpc/revert-11121-revert-10849-backward-compat | 2017-05-16 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Revert "Revert "Implement Server Backward Compatibility"" | ||
* \ \ \ \ \ \ \ | Merge pull request #11000 from lyuxuan/poll_stat | 2017-05-16 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Get metric "polls/request" for benchmarks | ||
| | | | * | | | | | regenerate projects | 2017-05-16 | |
| | | | | | | | | | |||
| | | | * | | | | | fix python artifact build | 2017-05-16 | |
| |_|_|/ / / / / |/| | | | | | | | |||
| | | | | | * | | Bump to version 1.3.3 | 2017-05-16 | |
| | | | | | | | | |||
* | | | | | | | | Merge pull request #10800 from kpayson64/fix_alpine | 2017-05-16 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix alpine build | ||
* \ \ \ \ \ \ \ \ | Merge pull request #11087 from kpayson64/update_python_auth | 2017-05-15 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update Python interop tests to use google-auth package | ||
| | | * | | | | | | | fix extern c location | 2017-05-15 | |
| | | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #11080 from per-gron/flatbuffer-compatibility | 2017-05-15 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix Flatbuffer compatibility issues | ||
| | | | * | | | | | | | fix last merge | 2017-05-15 | |
| | | | | | | | | | | | |||
| | | | * | | | | | | | fix merge | 2017-05-15 | |
| | | | |\ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ \ \ | merge master, resolve conflict | 2017-05-15 | |
| | | | |\ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |||
| | | | | | * | | | | | | Revert "Revert "Implement Server Backward Compatibility"" | 2017-05-15 | |
| |_|_|_|_|/ / / / / / |/| | | | | | | | | | | |||
* | | | | | | | | | | | Merge pull request #10662 from sreecha/cq_mpsc_based | 2017-05-15 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | grpc_mpsc queue based completion queue | ||
* \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #11115 from jtattermusch/revamp_artifacts | 2017-05-15 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Revamp artifacts, packages and distribtests | ||
| | | * | | | | | | | | | | Fix clang-format issue | 2017-05-14 | |
| | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge pull request #11076 from dgquintas/epoll_error_static_string | 2017-05-12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't crate GRPC_OS_ERROR with a non-static string | ||
* \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/grpc/grpc into import | 2017-05-13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | Revert "Implement Server Backward Compatibility" | 2017-05-12 | |
| | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into import | 2017-05-12 | |
|\| | | | | | | | | | | | | | | |||
| | | | | | | | | | | | * | | | Merge branch 'master' into backward-compat-dev | 2017-05-12 | |
| | | | | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | Merge pull request #10849 from muxi/backward-compat | 2017-05-12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Server Backward Compatibility | ||
| | | | | | | | | | | * \ \ \ \ | Merge github.com:grpc/grpc into serve_fries | 2017-05-12 | |
| | | | | | | | | | | |\ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into import | 2017-05-12 | |
|\| | | | | | | | | | | | | | | | |||
| | | | | | | * | | | | | | | | | Update Python interop tests to use google-auth package | 2017-05-12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The oauth2client test dependency is still needed as it used by the beta API unit tests. | ||
| * | | | | | | | | | | | | | | | Merge pull request #11104 from yang-g/generic_deadline_propagation | 2017-05-12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Propagate deadline to GenericServerContext | ||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/grpc/grpc into import | 2017-05-12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |