Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-05 |
|\ | |||
| * | Merge pull request #2656 from yang-g/reconnect_branch_based_on_jitter | Vijay Pai | 2015-08-05 |
| |\ | | | | | | | Connection backoff interop test client and server | ||
* | \ | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-03 |
|\ \ \ | |||
| | | * | merge with head and resolve conflicts | yang-g | 2015-08-03 |
| | | |\ | | |_|/ | |/| | | |||
| | * | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-08-01 |
| | |\ \ | | |/ / | |/| | | | | | | | | | | Conflicts: Makefile | ||
* | | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-07-31 |
|\ \ \ \ | |||
* | | | | | Add zookeeper end-to-end test | Hongwei Wang | 2015-07-31 |
| | | | | | |||
| | * | | | Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about | Craig Tiller | 2015-07-31 |
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: vsprojects/Grpc.mak vsprojects/grpc.sln vsprojects/grpc/grpc.vcxproj vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj vsprojects/grpc_unsecure/grpc_unsecure.vcxproj | ||
| | | * | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-07-31 |
| | | |\ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: templates/vsprojects/grpc.sln.template templates/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj.template templates/vsprojects/sln_defs.include templates/vsprojects/vcxproj_defs.include vsprojects/grpc.sln vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj | ||
| * | | | | Merge pull request #2731 from nicolasnoble/regen-and-vs-tweaks | Jan Tattermusch | 2015-07-30 |
| |\ \ \ \ | | | | | | | | | | | | | Regenerating project files and massaging VS project files. | ||
| | * | | | | Regenerating project files and massaging VS project files. | Nicolas Noble | 2015-07-30 |
| | | | | | | |||
| | | | * | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-07-30 |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
| | | | * | | Merge branch 'regen-and-vs-tweaks' of github.com:nicolasnoble/grpc into ↵ | Craig Tiller | 2015-07-30 |
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | tepid-tarantula | ||
| | | | | * | | Regenerating project files and massaging VS project files. | Nicolas Noble | 2015-07-31 |
| | | |_|/ / | | |/| | | | |||
| * | | | | | merge with master, fix build issue | Alistair Veitch | 2015-07-30 |
| | | | | | | |||
| * | | | | | Merge branch 'master' into issue_2709 | Alistair Veitch | 2015-07-30 |
| |\ \ \ \ \ | |||
| * | | | | | | Move grpc_census_call_*_context calls into public header | Alistair Veitch | 2015-07-30 |
| | | | | | | | |||
| | | | * | | | Add a subchannel factory decorator library | Craig Tiller | 2015-07-29 |
| | | | | | | | |||
| | | | * | | | Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about | Craig Tiller | 2015-07-29 |
| | | | |\ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/channel/http_client_filter.c src/core/surface/channel.c | ||
| | | | | * | | Allow specific pollers to be woken | Craig Tiller | 2015-07-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if two threads call grpc_completion_queue_pluck on the same completion queue for different tags, there is a 50% chance that we deliver the completion wakeup to the wrong poller - forcing the correct poller to wait until its polling times out before it can return an event up to the application. This change tweaks our polling interfaces so that we can indeed wake a specific poller. Nothing has been performance tuned yet. It's definitely sub-optimal in a number of places. Wakeup file-descriptors should be recycled. We should have a path that avoids calling poll() followed by epoll(). We can probably live without it right at the second though. This code will fail on Windows at least (I'll do that port when I'm in the office and have a Windows machine). | ||
| | | | | * | | Regenerate project files. | Nicolas "Pixel" Noble | 2015-07-29 |
| | | |_|/ / | | |/| | | | |||
* | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-07-28 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| | | | | * | merge with upstream | yang-g | 2015-07-28 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | | * | | | regenerate projects | yang-g | 2015-07-28 |
| | |/ / / | |/| | | | |||
| * | | | | Merge pull request #2506 from larsonmpdx/gitt | Nicolas Noble | 2015-07-28 |
| |\ \ \ \ | | | | | | | | | | | | | changes to allow VS solution/project generation and grpc.mak generation for c++ tests | ||
* | \ \ \ \ | Merge branch 'iomgr-refcounting' of https://github.com/nicolasnoble/grpc ↵ | Hongwei Wang | 2015-07-27 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | into zookeeper | ||
| | | | * | | Merge branch 'sometimes-its-good-just-to-check-in-with-each-other' into ↵ | Craig Tiller | 2015-07-26 |
| | | | |\ \ | | | |_|/ / | | |/| | | | | | | | | | yeah-we-know-what-youre-talking-about | ||
| | * | | | | Merge github.com:grpc/grpc into ↵ | Craig Tiller | 2015-07-26 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other Conflicts: src/core/iomgr/tcp_server_windows.c | ||
| | | | | * | Add reconnect interop test client and server | yang-g | 2015-07-24 |
| | | |_|/ | | |/| | | |||
| * | | | | Merge branch 'master' into deepend | Vijay Pai | 2015-07-24 |
| |\ \ \ \ | |||
| | | | | * | Make passing NULL for host not crash | Craig Tiller | 2015-07-23 |
| | | | |/ | | | |/| | |||
| * | | | | Add dynamic thread pool and initial port of test | vjpai | 2015-07-23 |
| | | | | | |||
| | | * | | Merge github.com:grpc/grpc into ↵ | Craig Tiller | 2015-07-23 |
| | | |\ \ | | | |/ / | | |/| | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| | * | | | Merge pull request #2493 from a-veitch/record_stat | Craig Tiller | 2015-07-23 |
| | |\ \ \ | | | | | | | | | | | | | Census record stats API | ||
| | | | | * | documentation for windows testing using grpc.mak | Michael Larson | 2015-07-21 |
| | | | | | | |||
* | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-07-20 |
|\| | | | | | |||
| | | * | | | fix build | Alistair Veitch | 2015-07-20 |
| | | | | | | |||
| | * | | | | Add ipv4:, ipv6: schemes | Craig Tiller | 2015-07-20 |
| |/ / / / | |||
| | | * | | Merge github.com:grpc/grpc into ↵ | Craig Tiller | 2015-07-20 |
| | | |\ \ | | |_|/ / | |/| | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| * | | | | Merge branch 'decompression' of https://github.com/dgquintas/grpc into ↵ | Craig Tiller | 2015-07-19 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dgquintas-decompression Conflicts: Makefile vsprojects/Grpc.mak | ||
| | | | | * | nmake: continue on error | Michael Larson | 2015-07-19 |
| | | | | | | |||
| | | | | * | documentation of new vcxproj/.sln debug buildgen | Michael Larson | 2015-07-19 |
| | | | | | | |||
| | | | | * | new includes / one less warning | Michael Larson | 2015-07-19 |
| | | | | | | |||
| | | | | * | new .props that has c++ dependencies | Michael Larson | 2015-07-19 |
| | |_|_|/ | |/| | | | |||
| | | | * | Merge github.com:grpc/grpc into ↵ | Craig Tiller | 2015-07-17 |
| | | | |\ | | | | | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| * | | | \ | Merge with head and resolve conflict | yang-g | 2015-07-17 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||
* | | | | | | Merge branch 'master' into zookeeper | Hongwei Wang | 2015-07-17 |
|\ \ \ \ \ \ | |||
| | | | | * | | rebuild makefile | Alistair Veitch | 2015-07-17 |
| | | | | | | | |||
| | | * | | | | Merge github.com:grpc/grpc into no-worries-i-can-wait | Craig Tiller | 2015-07-17 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| * | | | | | | Merge with head | yang-g | 2015-07-16 |
| |\ \ \ \ \ \ |