Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into sceq | 2016-02-17 | |
|\ | |||
| * | Merge pull request #5209 from vjpai/why_lever | 2016-02-16 | |
| |\ | | | | | | | Delete fixed_size_thread_pool | ||
| * \ | Merge pull request #5201 from vjpai/alarm_openloop | 2016-02-16 | |
| |\ \ | | | | | | | | | Revive and reform open-loop QPS testing | ||
| * \ \ | Merge pull request #5098 from a-veitch/base_log | 2016-02-16 | |
| |\ \ \ | | | | | | | | | | | Add Census base log | ||
| | | | * | Merge branch 'master' into why_lever | 2016-02-13 | |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | | * | | Merge remote-tracking branch 'upstream/master' into alarm_openloop | 2016-02-13 | |
| | | | | | |||
| * | | | | 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 | ||
| | | | * \ | Merge branch 'master' into alarm_openloop | 2016-02-12 | |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
| | | | | * | Merge branch 'master' into why_lever | 2016-02-12 | |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | * | | | | Merge pull request #5223 from murgatroid99/node_mac_artifact_build_fix | 2016-02-12 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | Node Mac artifact build fix | ||
| | | * | | | | Run Node distrib tests on Mac against only one Node version | 2016-02-12 | |
| | | | | | | | |||
| | * | | | | | Use precompiled extensions only | 2016-02-12 | |
| | | | | | | | |||
| | | * | | | | Properly handle rm -rf result on Mac | 2016-02-12 | |
| | | | | | | | |||
| * | | | | | | Merge pull request #5078 from ctiller/compatibility_mode | 2016-02-12 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make binary compatibility not the default | ||
| | | | * | | | | Don't have artifact build depend on global node-pre-gyp | 2016-02-12 | |
| | | |/ / / / | |||
| | | * | | | | Ensure that node-pre-gyp is properly bundled | 2016-02-11 | |
| | | | | | | | |||
| | | * | | | | Disable Node Mac 0.10 distrib test | 2016-02-11 | |
| | | | | | | | |||
| | | * | | | | Fix node distrib test on Debian Jessie x86 | 2016-02-11 | |
| | | | | | | | |||
| * | | | | | | Merge pull request #5190 from murgatroid99/node_windows_tests | 2016-02-11 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make Node tests run on Windows | ||
| * | | | | | | | 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 | ||
| | | | | * | | | | Reorder Python artifact commands | 2016-02-11 | |
| | | | | | | | | | |||
| | | | | | | | * | fixed_size_thread_pool : why do we even have that lever? It has been | 2016-02-11 | |
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | deprecated and unused for quite some time. | ||
| | | | | | | * | Merge branch 'master' into alarm_openloop | 2016-02-11 | |
| | | | | | | |\ | | |_|_|_|_|_|/ | |/| | | | | | | |||
| | | | | * | | | Paper over custom command limitations | 2016-02-11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The custom gRPC bdist command depends on numerous undocumented and private behaviors of setuptools, wheel, distutils, etc. One such is the ordering of generated distribution targets. We paper over this under the assumption that the command will only be useful for gRPC devs, and document with a command description a contractual obligation of users of the command. | ||
| * | | | | | | | Merge pull request #5193 from vjpai/alarm_mods | 2016-02-11 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Make C++ alarm class usable and testable | ||
| | | | | | * | | | Use wheels instead for custom bdists | 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 github.com:grpc/grpc into compatibility_mode | 2016-02-11 | |
| | | | | | |\ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||
| | | | | | | | * | Simplify and properly implement openloop testing. | 2016-02-11 | |
| | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | Revive it in tests as well | ||
| | | | * | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | 2016-02-11 | |
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||
| | | * | | | | | Revive gpr | 2016-02-11 | |
| | | | | | | | | |||
| | | * | | | | | Sanity: clang-format and regen projects | 2016-02-11 | |
| | | | | | | | | |||
| | | * | | | | | Merge branch 'master' into alarm_mods | 2016-02-11 | |
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
| | | * | | | | | Properly specify dependences on alarm.h in build.yaml | 2016-02-10 | |
| | | | | | | | | |||
| * | | | | | | | Merge pull request #5165 from ctiller/bring_back_gpr | 2016-02-10 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Bring back gpr | ||
| | | | * | | | | | Make C++ alarm class usable and testable - there were some build issues and | 2016-02-10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it was not actually even included in the library or the test suite. | ||
| | | | | | * | | | Make Node tests run on Windows | 2016-02-10 | |
| | | | | |/ / / | | | | |/| | | | |||
| | | * | | | | | Merge pull request #5182 from murgatroid99/node_drop_0.10_compat | 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 | 2016-02-10 | |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | / / / / | | |_|_|/ / / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #5184 from nicolasnoble/merge-and-regen | 2016-02-10 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Merge from 0.13 and regen projects. | ||
| | * \ \ \ \ \ \ | Merge remote-tracking branch 'google/release-0_13' into merge-and-regen | 2016-02-10 | |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.yaml src/ruby/lib/grpc/version.rb | ||
| | | | | | * | | | | Stop explicitly supporting Node 0.10 and 0.11 | 2016-02-10 | |
| | | | |_|/ / / / | | | |/| | | | | | |||
| * | | | | | | | | use HOME env var | 2016-02-10 | |
| | | | | | | | | | |||
| | | | * | | | | | Node Mac distribtest: fix handling of docker_suffix=None | 2016-02-10 | |
| | | | | | | | | | |||
| | | | * | | | | | Removed macos from the docker_suffix list | 2016-02-10 | |
| | | | | | | | | | |||
| | | | * | | | | | Fixed node mac distrib tests | 2016-02-10 | |
| | | | | | | | | | |||
| | | | * | | | | | Enable Node distrib tests on Mac | 2016-02-10 | |
| | | |/ / / / / | |||
| * | / / / / / | the host file path to the auth.json file has changed | 2016-02-09 | |
| |/ / / / / / |