Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into bad_metadata | Craig Tiller | 2016-02-12 |
|\ | |||
| * | Merge pull request #4926 from gitter-badger/gitter-badge | Kailash Sethuraman | 2016-02-11 |
| |\ | | | | | | | Add a Gitter chat badge to README.md | ||
| * \ | Merge pull request #5052 from ctiller/compress | David G. Quintas | 2016-02-11 |
| |\ \ | | | | | | | | | Fix race condition in transport API | ||
| * \ \ | Merge pull request #5190 from murgatroid99/node_windows_tests | Jan Tattermusch | 2016-02-11 |
| |\ \ \ | | | | | | | | | | | Make Node tests run on Windows | ||
| * \ \ \ | Merge pull request #5211 from grpc/revert-4038-grpclb_api | Craig Tiller | 2016-02-11 |
| |\ \ \ \ | | | | | | | | | | | | | Revert "Proto API for LB request/responses" | ||
| | * | | | | Revert "Proto API for LB request/responses" | Craig Tiller | 2016-02-11 |
| |/ / / / | |||
| * | | | | Merge pull request #4038 from dgquintas/grpclb_api | Craig Tiller | 2016-02-11 |
| |\ \ \ \ | | | | | | | | | | | | | Proto API for LB request/responses | ||
| * \ \ \ \ | Merge pull request #5079 from nicolasnoble/underscores_are_the_root_of_all_evil | David G. Quintas | 2016-02-11 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Removing underscores in CENSUS_API, GRPC_API and GPR_API. | ||
| * \ \ \ \ \ | Merge pull request #5193 from vjpai/alarm_mods | Craig Tiller | 2016-02-11 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make C++ alarm class usable and testable | ||
| * \ \ \ \ \ \ | Merge pull request #4913 from pszemus/master | Jan Tattermusch | 2016-02-11 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update protobuf version to v3.0.0-beta-2 | ||
| * \ \ \ \ \ \ \ | Merge pull request #5205 from grpc/release-0_13 | Craig Tiller | 2016-02-11 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Release 0.13 upmerge. | ||
| | | | | | | | * \ | Merge github.com:grpc/grpc into compress | Craig Tiller | 2016-02-11 |
| | | | | | | | |\ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||
| | | | * | | | | | | Remove a small allocation, at the cost of a little uglier header file. | Vijay Pai | 2016-02-11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit may or may not be a great tradeoff. | ||
| | | * | | | | | | | Update copyright | Przemysław Sobala | 2016-02-11 |
| | | | | | | | | | | |||
| * | | | | | | | | | Merge pull request #5198 from dgquintas/server_interface_cleanup | David G. Quintas | 2016-02-11 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Removed outdated mention of AsynchronousService | ||
| | | | | | | * \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | David Garcia Quintas | 2016-02-11 |
| | | | | | | |\ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||
| | * | | | | | | | | | Removed outdated mention of AsynchronousService | David Garcia Quintas | 2016-02-11 |
| |/ / / / / / / / / | |||
| | | | * | | | | | | Revive gpr | Vijay Pai | 2016-02-11 |
| | | | | | | | | | | |||
| | | | * | | | | | | Sanity: clang-format and regen projects | Vijay Pai | 2016-02-11 |
| | | | | | | | | | | |||
| | | | * | | | | | | Merge branch 'master' into alarm_mods | Vijay Pai | 2016-02-11 |
| | | | |\ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||
| | | | * | | | | | | init test | vjpai | 2016-02-11 |
| | | | | | | | | | | |||
| * | | | | | | | | | Merge pull request #5191 from ctiller/fixdocker | Vijay Pai | 2016-02-11 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix docker inception for now | ||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #5196 from yang-g/no_rpc_service | Vijay Pai | 2016-02-11 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add a dummy reference to prevent unused variable warning if there is … | ||
| | * | | | | | | | | | | Add a dummy reference to prevent unused variable warning if there is no rpc ↵ | yang-g | 2016-02-10 |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | method defined. | ||
| | | | | * | | | | | | tag fed in by user should be any arbitrary tag, not a CompletionQueueTag | vjpai | 2016-02-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | type | ||
| | | * | | | | | | | | Merge pull request #5156 from jtattermusch/ruby_distribtest | Nicolas Noble | 2016-02-10 |
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Ruby distribtests on Linux | ||
| | | | | | * | | | | | | Properly specify dependences on alarm.h in build.yaml | vjpai | 2016-02-10 |
| | | | | | | | | | | | | |||
| | | | * | | | | | | | | make all the remaining ruby distribtest pass | Jan Tattermusch | 2016-02-10 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | Merge pull request #5192 from nicolasnoble/fixing-ruby-example | Jan Tattermusch | 2016-02-10 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing Ruby examples. | ||
| * | | \ \ \ \ \ \ \ \ \ | Merge pull request #5165 from ctiller/bring_back_gpr | Nicolas Noble | 2016-02-10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring back gpr | ||
| | | | | * | | | | | | | | | Fixing copyrights. | Nicolas "Pixel" Noble | 2016-02-11 |
| | | | | | | | | | | | | | | |||
| | | | | * | | | | | | | | | Fixing Ruby examples. | Nicolas "Pixel" Noble | 2016-02-11 |
| | | | |/ / / / / / / / / | |||
| | | | | * | | | | | | | | install bundler in dockerfiles | Jan Tattermusch | 2016-02-10 |
| | | | | | | | | | | | | | |||
| | | | | | | * | | | | | | Make C++ alarm class usable and testable - there were some build issues and | vjpai | 2016-02-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it was not actually even included in the library or the test suite. | ||
| | | | | * | | | | | | | | ruby distribtest | Jan Tattermusch | 2016-02-10 |
| | | | |/ / / / / / / / | |||
| | | * | | | | | | | | | Fix docker inception for now | Craig Tiller | 2016-02-10 |
| | | | | | | | | | | | | |||
| * | | | | | | | | | | | Merge pull request #5188 from jtattermusch/resolve_0_13_merge | Michael Lumish | 2016-02-10 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Upmerge changes from release-0_13 | ||
| | | | | | | | | | * | | | Make Node tests run on Windows | Michael Lumish | 2016-02-10 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||
| * | | | | | | | | | | | Merge pull request #5185 from lepatryk/byte-buffer | Michael Lumish | 2016-02-10 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | Pass delete[] explicitely to Nan::NewBuffer. | ||
| | | | | | * | | | | | | Merge pull request #5182 from murgatroid99/node_drop_0.10_compat | Nicolas Noble | 2016-02-10 |
| | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop explicitly supporting Node 0.10 and 0.11 | ||
| | | * | | | | | | | | | | Merge remote-tracking branch 'upstream/release-0_13' into resolve_0_13_merge | Jan Tattermusch | 2016-02-10 |
| | |/| | | | | | | | | | | |/| | | |/ / / / / / / | | | | |/| | | | | | | | | | |/| | | | | | | | | |||
| | | * | | | | | | | | | Merge pull request #5187 from jtattermusch/1sec | Jan Tattermusch | 2016-02-10 |
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 1 second stall on Windows | ||
| * | | \ \ \ \ \ \ \ \ \ | Merge pull request #5041 from ejona86/sync-protos | Yang Gao | 2016-02-10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync java options in example protos | ||
| | | | | * | | | | | | | | | WTF | Craig Tiller | 2016-02-10 |
| | | | | | | | | | | | | | | |||
| | | | | * | | | | | | | | | Fix 1 second stall on Windows | Craig Tiller | 2016-02-10 |
| | | | |/ / / / / / / / / | |||
| * | | | | | | | | | | | | Merge pull request #5184 from nicolasnoble/merge-and-regen | Jan Tattermusch | 2016-02-10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge from 0.13 and regen projects. | ||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'google/release-0_13' into merge-and-regen | Nicolas "Pixel" Noble | 2016-02-10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.yaml src/ruby/lib/grpc/version.rb | ||
| | | | | | * | | | | | | | | Merge pull request #5179 from murgatroid99/node_distrib_test_macos_0.13 | Jan Tattermusch | 2016-02-10 |
| | | | |_|/| | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Enable Node distrib tests on Mac on release-0_13 | ||
| | | | | * | | | | | | | | | Pass delete[] explicitely to Nan::NewBuffer. | Patryk Lesiewicz | 2016-02-10 |
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the Nan::NewBuffer version that accepts an explicit callback deallocating buffers. This way we'll be resilient to different nan/node versions. Fixes grpc/grpc#4867 | ||
| * | | | | | | | | | | | | Merge pull request #5172 from stanley-cheung/composer-test | Stanley Cheung | 2016-02-10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | Test fix php interop test composer install git clone problem |