Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | | Merge branch 'census-placeholders' into make-ruby-installable | Nicolas "Pixel" Noble | 2016-01-31 | |
|\| | | | | | | | | | ||||
| * | | | | | | | | | Adding log.h for definition of abort. | Nicolas "Pixel" Noble | 2016-01-31 | |
| | | | | | | | | | | ||||
* | | | | | | | | | | Merge branch 'census-placeholders' into make-ruby-installable | Nicolas "Pixel" Noble | 2016-01-31 | |
|\| | | | | | | | | | ||||
| * | | | | | | | | | Forgot the abort(). | Nicolas "Pixel" Noble | 2016-01-31 | |
| | | | | | | | | | | ||||
* | | | | | | | | | | Merge branch 'census-placeholders' into make-ruby-installable | Nicolas "Pixel" Noble | 2016-01-31 | |
|\| | | | | | | | | | ||||
| * | | | | | | | | | Missed one. | Nicolas "Pixel" Noble | 2016-01-31 | |
| | | | | | | | | | | ||||
* | | | | | | | | | | Merge branch 'census-placeholders' into make-ruby-installable | Nicolas "Pixel" Noble | 2016-01-31 | |
|\| | | | | | | | | | ||||
| * | | | | | | | | | Typos. | Nicolas "Pixel" Noble | 2016-01-31 | |
| | | | | | | | | | | ||||
* | | | | | | | | | | Merge branch 'census-placeholders' into make-ruby-installable | Nicolas "Pixel" Noble | 2016-01-31 | |
|\| | | | | | | | | | ||||
| * | | | | | | | | | Typo. | Nicolas "Pixel" Noble | 2016-01-31 | |
| | | | | | | | | | | ||||
* | | | | | | | | | | 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 | |||
| * | | | | | | | | | Actually moving this to the proper place. | Nicolas "Pixel" Noble | 2016-01-31 | |
| | | | | | | | | | | ||||
* | | | | | | | | | | Building the grpc DLLs. | Nicolas "Pixel" Noble | 2016-01-31 | |
| | | | | | | | | | | ||||
* | | | | | | | | | | Regenerating files. | Nicolas "Pixel" Noble | 2016-01-31 | |
| | | | | | | | | | | ||||
* | | | | | | | | | | Merge branch 'no_extern_allowed' into make-ruby-installable | Nicolas "Pixel" Noble | 2016-01-31 | |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||
| * | | | | | | | | | Replacing grpc_max_auth_token_lifetime by an accessor. | Nicolas "Pixel" Noble | 2016-01-31 | |
| | | | | | | | | | | ||||
* | | | | | | | | | | Merge branch 'census-placeholders' into make-ruby-installable | Nicolas "Pixel" Noble | 2016-01-31 | |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||
| * | | | | | | | | | Creating placeholders for missing census functions. | Nicolas "Pixel" Noble | 2016-01-31 | |
| |/ / / / / / / / | ||||
* | | | | | | | | | Merge branch 'win32_subprocess' into make-ruby-installable | Nicolas "Pixel" Noble | 2016-01-31 | |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: BUILD Makefile binding.gyp build.yaml gRPC.podspec grpc.gemspec src/python/grpcio/grpc_core_dependencies.py tools/run_tests/sources_and_headers.json vsprojects/vcxproj/gpr/gpr.vcxproj vsprojects/vcxproj/gpr/gpr.vcxproj.filters | |||
| * | | | | | | | | Adding windows support for gpr subprocesses. | Nicolas "Pixel" Noble | 2016-01-31 | |
| |/ / / / / / / | ||||
* | | | | | | | | Merge branch 'alarming' into make-ruby-installable | Nicolas "Pixel" Noble | 2016-01-31 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/run_tests/sources_and_headers.json | |||
| * | | | | | | | Fixing, using and testing alarm code. | Nicolas "Pixel" Noble | 2016-01-31 | |
| |/ / / / / / | ||||
| | * | | | | | Pass undiagnosed errors to the user unadulterated | Masood Malekghassemi | 2016-01-30 | |
| | | | | | | | ||||
| | * | | | | | Diagnose missing Cython-generated files | Masood Malekghassemi | 2016-01-30 | |
| |/ / / / / | ||||
* | | | | | | Merge branch 'master' of github.com:grpc/grpc into make-ruby-installable | Nicolas "Pixel" Noble | 2016-01-30 | |
|\| | | | | | ||||
* | | | | | | Fixing the Ruby build after all these merges. | Nicolas "Pixel" Noble | 2016-01-30 | |
| | | | | | | ||||
* | | | | | | Removing gpr as a separated library. | Nicolas "Pixel" Noble | 2016-01-30 | |
| | | | | | | ||||
| * | | | | | Merge pull request #4946 from soltanmm/doctor-calling-doctor | Masood Malekghassemi | 2016-01-30 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix Python diagnostics dying on bad diagnosis | |||
* | | | | | | | Merge branch 'master' of github.com:grpc/grpc into make-ruby-installable | Nicolas "Pixel" Noble | 2016-01-30 | |
|\| | | | | | | ||||
* | | | | | | | Merge branch 'autogen' into make-ruby-installable | Nicolas "Pixel" Noble | 2016-01-30 | |
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | Finalizing this a bit. | Nicolas "Pixel" Noble | 2016-01-30 | |
| | | | | | | | | ||||
| | * | | | | | | create a .zip file with nuget packages | Jan Tattermusch | 2016-01-29 | |
| | | | | | | | | ||||
| * | | | | | | | Usable API list | Craig Tiller | 2016-01-29 | |
| | | | | | | | | ||||
* | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into make-ruby-installable | Nicolas "Pixel" Noble | 2016-01-30 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||
| * | | | | | | | Merge pull request #4952 from murgatroid99/node_windows_compile | Nicolas Noble | 2016-01-29 | |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | Compile Node library on Windows | |||
* | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into make-ruby-installable | Nicolas "Pixel" Noble | 2016-01-29 | |
|\| | | | | | | | ||||
* | | | | | | | | Renaming the Ruby grpc extension to grpc_c, and renaming its loader from ↵ | Nicolas "Pixel" Noble | 2016-01-29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loader.rb to grpc.rb | |||
| | | | | | * | | Merge remote-tracking branch 'upstream/master' into stalled_by_transport_race2 | yang-g | 2016-01-29 | |
| | | | | | |\ \ | | |_|_|_|_|/ / | |/| | | | | | | ||||
| * | | | | | | | Merge pull request #4960 from vjpai/kill_host | Jan Tattermusch | 2016-01-29 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Remove host option from ServerConfig proto | |||
| | * | | | | | | | Fix a typo | Vijay Pai | 2016-01-29 | |
| | | | | | | | | | ||||
| * | | | | | | | | Merge pull request #4874 from rjshade/add_comments_to_transport | David G. Quintas | 2016-01-29 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add comments to grpc_transport_stream_op structure | |||
| * \ \ \ \ \ \ \ \ | Merge pull request #4959 from grpc/release-0_12 | Michael Lumish | 2016-01-29 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Release 0.12 -> master | |||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #4963 from soltanmm/kill-it-with-rm | Nathaniel Manista | 2016-01-29 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | Remove dead src/python/README.md. | |||
| | * | | | | | | | | | Remove dead Python README.md | Masood Malekghassemi | 2016-01-29 | |
| | | | | | | | | | | | ||||
| | | | * | | | | | | | Update copyright, clang-format for line wrapping of comment. | Robbie Shade | 2016-01-29 | |
| | | | | | | | | | | | ||||
| | | | | * | | | | | | Remove host option from ServerConfig proto since it is error-prone and | Vijay Pai | 2016-01-29 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | may cause inter-language confusion. | |||
* | | | | | | | | | | Fixing dll hell. | Nicolas "Pixel" Noble | 2016-01-29 | |
| | | | | | | | | | | ||||
| * | | | | | | | | | Merge pull request #4950 from ctiller/offload-racing | David G. Quintas | 2016-01-28 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Preparatory changes for work shedding | |||
| | | | | | | | * | | | ooops, forgot this... | Julien Boeuf | 2016-01-28 | |
| | | | | | | | | | | |