Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | 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 github.com:grpc/grpc into cleaner-posix | Craig Tiller | 2016-02-18 |
| | |\ | |_|/ |/| | | |||
* | | | 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 remote-tracking branch 'google/release-0_13' into upmerge-from-0.13 | Nicolas "Pixel" Noble | 2016-02-13 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile build.yaml package.json setup.py src/core/surface/version.c src/csharp/Grpc.Core/VersionInfo.cs src/csharp/build_packages.bat src/python/grpcio/grpc_version.py src/ruby/lib/grpc/version.rb tools/doxygen/Doxyfile.c++ tools/doxygen/Doxyfile.c++.internal tools/doxygen/Doxyfile.core tools/doxygen/Doxyfile.core.internal | ||
| | * | | Flagging 0.13.1-pre1. | Nicolas "Pixel" Noble | 2016-02-13 |
| | | | | |||
| | * | | Flagging the release. | Nicolas "Pixel" Noble | 2016-02-13 |
| | | | | |||
| | * | | Ensure we use local node-pre-gyp in Node install hook | murgatroid99 | 2016-02-12 |
| | | | | |||
| * | | | 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 | ||
| | | * | | Bundle node-pre-gyp with the node package | murgatroid99 | 2016-02-11 |
| | | | | | |||
| * | | | | Merge pull request #5205 from grpc/release-0_13 | Craig Tiller | 2016-02-11 |
| |\ \ \ \ | | | |/ / | | |/| | | Release 0.13 upmerge. | ||
| | | | * | 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 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | * | | | Stop explicitly supporting Node 0.10 and 0.11 | murgatroid99 | 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 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| * | | | | Flagging master as 0.14.0-dev. | Nicolas "Pixel" Noble | 2016-02-09 |
| |/ / / | |||
| * | | | Make Node's package.json use the version from build.yaml | murgatroid99 | 2016-02-08 |
| | | | | |||
| | | * | merge | Alistair Veitch | 2016-02-05 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge pull request #5013 from a-veitch/tag_set_to_context | Bogdan Drutu | 2016-02-04 |
| |\ \ \ | | | | | | | | | | | Change all instances of census_tag_set to census_context | ||
| | * \ \ | merge | Alistair Veitch | 2016-02-03 |
| | |\ \ \ | |||
| * | | | | | Add new Node JS file to build.yaml | murgatroid99 | 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. | ||
| | | | * \ \ | 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 |
| | | | | | | | |||
| | | | * | | | 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 |
| |/ / / / | |||
| | * / / | Removing gpr as a separated library. | Nicolas "Pixel" Noble | 2016-01-30 |
| |/ / / | |||
| | | * | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | David Garcia Quintas | 2016-01-29 |
| | | |\ | | |_|/ | |/| | | |||
| | | * | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | David Garcia Quintas | 2016-01-28 |
| | | |\ | |||
* | | | \ | Merge github.com:grpc/grpc into sceq | Craig Tiller | 2016-01-28 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||
| | * | | | Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces | David Garcia Quintas | 2016-01-27 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge branch 'master' into node_binary_precompile | murgatroid99 | 2016-01-26 |
| |\ \ \ \ | |||
| | | * | | | async_stream.h done. Compiles | David Garcia Quintas | 2016-01-25 |
| | | | | | | |||
| | | * | | | Further work. Compiles. WIP | David Garcia Quintas | 2016-01-25 |
| | | | | | |