Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into filter-selection | Craig Tiller | 2016-03-17 |
|\ | |||
* \ | Merge github.com:grpc/grpc into filter-selection | Craig Tiller | 2016-03-17 |
|\ \ | |||
| | * | Merge github.com:grpc/grpc into backoff_lib | Craig Tiller | 2016-03-17 |
| | |\ | | |/ | |/| | |||
| * | | Massaging that pull request. | Nicolas "Pixel" Noble | 2016-03-17 |
| | | | |||
| | * | Build out backoff as a library | Craig Tiller | 2016-03-11 |
| | | | |||
| * | | Merge branch 'codegen_proto_utils_fix' into codegen_lib | David Garcia Quintas | 2016-03-06 |
| |\| | |||
* | | | Merge github.com:grpc/grpc into filter-selection | Craig Tiller | 2016-02-25 |
|\ \ \ | | |/ | |/| | |||
| * | | Merge github.com:grpc/grpc into naming-crisis | Craig Tiller | 2016-02-23 |
| |\ \ | |||
| | * \ | Merge github.com:grpc/grpc into fix-proto-docker | Craig Tiller | 2016-02-22 |
| | |\ \ | |||
| * | \ \ | Merge github.com:grpc/grpc into naming-crisis | Craig Tiller | 2016-02-22 |
| |\ \ \ \ | | | |/ / | | |/| | | |||
| * | | | | Regenerate files, fix bugs | Craig Tiller | 2016-02-22 |
| |\ \ \ \ | |||
* | \ \ \ \ | Merge github.com:grpc/grpc into filter-selection | Craig Tiller | 2016-02-22 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Merge pull request #5257 from ctiller/cleaner-posix | Vijay Pai | 2016-02-22 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Separate timer checking from pollsets | ||
| * | | | | | rename census log files to avoid build breakage on MacOS | Alistair Veitch | 2016-02-22 |
| | |/ / / | |/| | | | |||
| * | | | | Merge pull request #5302 from nicolasnoble/python-windows | Masood Malekghassemi | 2016-02-22 |
| |\ \ \ \ | | | | | | | | | | | | | Enabling python artifact building for Windows. | ||
| | * | | | | Building the dlls. | Nicolas "Pixel" Noble | 2016-02-19 |
| | | | | | | |||
| | | | | * | Merge branch 'master' of github.com:grpc/grpc into codegen_lib | David Garcia Quintas | 2016-02-18 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | | | | * | Split codegen target and made it libs | David Garcia Quintas | 2016-02-18 |
| | | |_|/ | | |/| | | |||
| | | * | | Merge github.com:grpc/grpc into cleaner-posix | Craig Tiller | 2016-02-18 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | | | * | Merge github.com:grpc/grpc into fix-proto-docker | Craig Tiller | 2016-02-18 |
| | | | |\ | | |_|_|/ | |/| | | | |||
* / | | | | Decouple filter selection from channel construction | Craig Tiller | 2016-02-17 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow plugins to extend the set of filters used by gRPC core: - plugins at construction time can register against the 'channel_init' system to be allowed to mutate a new channel_stack_builder type - channel_stack_builder provides a central and rather dynamic place to construct the list of filters required by a channel stack - ultimately we construct the channel stack in the fashion we always have This is also a prerequisite step to allowing filters to be implemented from wrapped languages. | ||
* | | | | Merge github.com:grpc/grpc into sceq | Craig Tiller | 2016-02-17 |
|\| | | | |||
| * | | | Merge pull request #5098 from a-veitch/base_log | Bogdan Drutu | 2016-02-16 |
| |\ \ \ | | | | | | | | | | | Add Census base log | ||
| | | * | | Separate timer checking from pollsets | Craig Tiller | 2016-02-16 |
| | |/ / | |/| | | |||
| * | | | Merge pull request #5254 from grpc/release-0_13 | Jan Tattermusch | 2016-02-15 |
| |\ \ \ | | | | | | | | | | | Release 0.13 upmerge. | ||
| | * | | | Adding the .yardopts file into the gems. | Nicolas "Pixel" Noble | 2016-02-14 |
| | | | | | |||
| | | | * | Revert "Revert "Proto API for LB request/responses"" | Craig Tiller | 2016-02-11 |
| | |_|/ | |/| | | |||
| * | | | Revert "Proto API for LB request/responses" | Craig Tiller | 2016-02-11 |
| | | | | |||
| | | * | merge to HEAD | Alistair Veitch | 2016-02-11 |
| | | |\ | |||
| * | | \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | David Garcia Quintas | 2016-02-11 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||
| | * | | | Merge pull request #5165 from ctiller/bring_back_gpr | Nicolas Noble | 2016-02-10 |
| | |\ \ \ | | | |/ / | | |/| | | Bring back gpr | ||
| | * | | | Fixing Ruby binary build (again). | Nicolas "Pixel" Noble | 2016-02-10 |
| | | | | | |||
* | | | | | Merge github.com:grpc/grpc into sceq | Craig Tiller | 2016-02-09 |
|\ \ \ \ \ | |||
| | | | * | | Get compilation working again | Craig Tiller | 2016-02-09 |
| | | | | | | |||
| | | | * | | Rollback gpr deletion | Craig Tiller | 2016-02-09 |
| | |_|/ / | |/| | | | |||
| | * | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | David Garcia Quintas | 2016-02-08 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | | * | | Fixing ruby versionning. | Nicolas "Pixel" Noble | 2016-02-09 |
| | |/ / | |/| | | |||
| | | * | Merge branch 'master' into base_log | Alistair Veitch | 2016-02-08 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Nope. | Nicolas "Pixel" Noble | 2016-02-08 |
| | | | | |||
| | | * | merge | Alistair Veitch | 2016-02-05 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | merge | Alistair Veitch | 2016-02-03 |
| |\ \ \ | |||
| | | | * | initial commit | Alistair Veitch | 2016-02-02 |
| | | | | | |||
| | * | | | Merge branch 'master' of github.com:grpc/grpc into make-ruby-installable | Nicolas "Pixel" Noble | 2016-02-03 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: BUILD Makefile binding.gyp build.yaml gRPC.podspec grpc.gemspec package.json src/python/grpcio/grpc_core_dependencies.py templates/Makefile.template tools/doxygen/Doxyfile.core.internal tools/run_tests/sources_and_headers.json vsprojects/vcxproj/gpr/gpr.vcxproj vsprojects/vcxproj/gpr/gpr.vcxproj.filters | ||
| * | | | | | post merge | Alistair Veitch | 2016-02-02 |
| | | | | | | |||
* | | | | | | Merge github.com:grpc/grpc into sceq | Craig Tiller | 2016-02-02 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||
| | | | * | | Use old memcpy for wrappers | Craig Tiller | 2016-02-02 |
| | |_|/ / | |/| | | | |||
| * | | | | Merge pull request #4979 from nicolasnoble/win32_subprocess | Craig Tiller | 2016-02-01 |
| |\ \ \ \ | | | | | | | | | | | | | Adding windows support for gpr subprocesses. | ||
| * \ \ \ \ | Merge pull request #4978 from nicolasnoble/alarming | Craig Tiller | 2016-01-31 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fixing, using and testing alarm code. | ||
| | | | | * | | Removing zookeeper's API for now. | Nicolas "Pixel" Noble | 2016-01-31 |
| | | | | | | | |||
| | | | | * | | Merge branch 'census-placeholders' into make-ruby-installable | Nicolas "Pixel" Noble | 2016-01-31 |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: package.json tools/doxygen/Doxyfile.core.internal |