Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'codegen_proto_utils_fix' into codegen_lib | 2016-03-06 | |
|\ | |||
| * | Faster code generation | 2016-02-24 | |
| | | |||
| * | Merge github.com:grpc/grpc into naming-crisis | 2016-02-23 | |
| |\ | |||
| | * | Merge github.com:grpc/grpc into fix-proto-docker | 2016-02-22 | |
| | |\ | |||
| * | \ | Merge github.com:grpc/grpc into naming-crisis | 2016-02-22 | |
| |\ \ \ | | | |/ | | |/| | |||
| * | | | Regenerate files, fix bugs | 2016-02-22 | |
| |\ \ \ | |||
| | | * | | Merge pull request #5257 from ctiller/cleaner-posix | 2016-02-22 | |
| | |/| | | | | | | | | | | | | Separate timer checking from pollsets | ||
| | * | | | rename census log files to avoid build breakage on MacOS | 2016-02-22 | |
| |/ / / | |||
| * | | | Merge pull request #5302 from nicolasnoble/python-windows | 2016-02-22 | |
| |\ \ \ | | | | | | | | | | | Enabling python artifact building for Windows. | ||
| | * | | | Building the dlls. | 2016-02-19 | |
| | | | | | |||
* | | | | | Fixed sanity | 2016-02-18 | |
| | | | | | |||
* | | | | | Merge branch 'master' of github.com:grpc/grpc into codegen_lib | 2016-02-18 | |
|\| | | | | |||
* | | | | | Split codegen target and made it libs | 2016-02-18 | |
| |/ / / |/| | | | |||
| | * | | Merge github.com:grpc/grpc into cleaner-posix | 2016-02-18 | |
| | |\ \ | | |/ / | |/| | | |||
| | | * | Merge github.com:grpc/grpc into fix-proto-docker | 2016-02-18 | |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge github.com:grpc/grpc into sceq | 2016-02-17 | |
| |\ \ \ | |/ / / |/| | | | |||
* | | | | Merge pull request #5098 from a-veitch/base_log | 2016-02-16 | |
|\ \ \ \ | | | | | | | | | | | Add Census base log | ||
| | | * | | Separate timer checking from pollsets | 2016-02-16 | |
| |_|/ / |/| | | | |||
* | | | | Merge remote-tracking branch 'google/release-0_13' into upmerge-from-0.13 | 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. | 2016-02-13 | |
| | | | | | |||
| * | | | | Flagging the release. | 2016-02-13 | |
| | | | | | |||
| * | | | | Ensure we use local node-pre-gyp in Node install hook | 2016-02-12 | |
| | | | | | |||
| | | | * | Revert "Revert "Proto API for LB request/responses"" | 2016-02-11 | |
| |_|_|/ |/| | | | |||
* | | | | Revert "Proto API for LB request/responses" | 2016-02-11 | |
| | | | | |||
* | | | | Merge pull request #4038 from dgquintas/grpclb_api | 2016-02-11 | |
|\ \ \ \ | | | | | | | | | | | Proto API for LB request/responses | ||
| | * | | | Bundle node-pre-gyp with the node package | 2016-02-11 | |
| | | | | | |||
* | | | | | Merge pull request #5205 from grpc/release-0_13 | 2016-02-11 | |
|\ \ \ \ \ | | |/ / / | |/| | | | Release 0.13 upmerge. | ||
| | | * | | merge to HEAD | 2016-02-11 | |
| | | |\ \ | |_|_|/ / |/| | | | | |||
| | * | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | 2016-02-11 | |
| | |\ \ \ | |_|/ / / |/| | | | | |||
| * | | | | Stop explicitly supporting Node 0.10 and 0.11 | 2016-02-10 | |
| | | | | | |||
| | | | * | Merge github.com:grpc/grpc into sceq | 2016-02-09 | |
| | | | |\ | |||
* | | | | | | Get compilation working again | 2016-02-09 | |
| | | | | | | |||
* | | | | | | Rollback gpr deletion | 2016-02-09 | |
| |_|_|_|/ |/| | | | | |||
| | * | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | 2016-02-08 | |
| | |\ \ \ | |_|/ / / |/| | | | | |||
* | | | | | Flagging master as 0.14.0-dev. | 2016-02-09 | |
|/ / / / | |||
* | | | | Make Node's package.json use the version from build.yaml | 2016-02-08 | |
| | | | | |||
| | * | | merge | 2016-02-05 | |
| | |\ \ | |_|/ / |/| | | | |||
* | | | | Merge pull request #5013 from a-veitch/tag_set_to_context | 2016-02-04 | |
|\ \ \ \ | | | | | | | | | | | Change all instances of census_tag_set to census_context | ||
| * \ \ \ | merge | 2016-02-03 | |
| |\ \ \ \ | |||
* | | | | | | Add new Node JS file to build.yaml | 2016-02-03 | |
| |/ / / / |/| | | | | |||
| | | * | | initial commit | 2016-02-02 | |
| | | | | | |||
* | | | | | Merge branch 'master' of github.com:grpc/grpc into make-ruby-installable | 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 | 2016-02-02 | |
| | | | | | | |||
| | | | | * | Merge github.com:grpc/grpc into sceq | 2016-02-02 | |
| | | | | |\ | | | | | |/ | | | | |/| | |||
| * | | / | | Use old memcpy for wrappers | 2016-02-02 | |
| | |_|/ / | |/| | | | |||
| * | | | | Merge pull request #4979 from nicolasnoble/win32_subprocess | 2016-02-01 | |
| |\ \ \ \ | | | | | | | | | | | | | Adding windows support for gpr subprocesses. | ||
| * \ \ \ \ | Merge pull request #4978 from nicolasnoble/alarming | 2016-01-31 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fixing, using and testing alarm code. | ||
* | | | | | | | Merge branch 'census-placeholders' into make-ruby-installable | 2016-01-31 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: package.json tools/doxygen/Doxyfile.core.internal | ||
| * | | | | | | Actually moving this to the proper place. | 2016-01-31 | |
| | | | | | | | |||
* | | | | | | | Merge branch 'win32_subprocess' into make-ruby-installable | 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 |