Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #5332 from yang-g/interop_echo_metadata | David G. Quintas | 2016-02-22 |
|\ | | | | | Add custom_metadata test case | ||
| * | copyright of course | yang-g | 2016-02-22 |
| | | |||
* | | Merge pull request #5258 from vjpai/poll_override2 | Craig Tiller | 2016-02-21 |
|\ \ | | | | | | | Avoid a race when overriding default poll function | ||
| | * | Add custom_metadata test case | yang-g | 2016-02-19 |
| |/ |/| | |||
* | | move tls type name to .cc file | yang-g | 2016-02-19 |
| | | |||
* | | Add a helper to return all the secure types | yang-g | 2016-02-19 |
| | | |||
* | | Revert "make an enum" | yang-g | 2016-02-19 |
| | | | | | | | | This reverts commit 5152cd29f8541d7600b7ddc3d9db188ad59ea673. | ||
* | | make an enum | yang-g | 2016-02-18 |
| | | |||
* | | Refactor end2end_test. Make the credentials a separate library. | yang-g | 2016-02-18 |
| | | |||
* | | clang format | David Garcia Quintas | 2016-02-17 |
| | | |||
* | | Fixed refactoring of grpc_arg pointer vtable | David Garcia Quintas | 2016-02-17 |
| | | |||
* | | Merge pull request #4859 from ctiller/sceq | Sree Kuchibhotla | 2016-02-17 |
|\ \ | | | | | | | Subchannel Sharing [The interop tests failures and Basic test failures are unrelated to this change. Merging] | ||
* \ \ | Merge pull request #5186 from yang-g/inherit_from_grpc_library | Sree Kuchibhotla | 2016-02-17 |
|\ \ \ | | | | | | | | | Provide explicit API for user to set user agent string prefix | ||
| | * \ | Merge github.com:grpc/grpc into sceq | Craig Tiller | 2016-02-17 |
| | |\ \ | |||
* | | | | | Document variable names | Vijay Pai | 2016-02-17 |
| | | | | | |||
* | | | | | Use more variables for better explanations | Vijay Pai | 2016-02-17 |
| | | | | | |||
* | | | | | Use three different load-factors and document load-factor variable | Vijay Pai | 2016-02-17 |
| | | | | | |||
* | | | | | Merge branch 'master' into loaded | Vijay Pai | 2016-02-16 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||
| | | | * | Merge branch 'master' into poll_override2 | Vijay Pai | 2016-02-16 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| * | | | | Fix copyright | vjpai | 2016-02-16 |
| | | | | | |||
| | | | * | Merge branch 'master' into poll_override2 | Vijay Pai | 2016-02-16 |
| | | | |\ | | |_|_|/ | |/| | | | |||
* | | | | | Merge branch 'master' into loaded | Vijay Pai | 2016-02-16 |
|\| | | | | |||
| * | | | | Fix the arguments type for on_read and destroy callbacks to match with ↵ | Bogdan Drutu | 2016-02-16 |
| | | | | | | | | | | | | | | | | | | | | grpc_iomgr_cb_func | ||
* | | | | | Merge branch 'master' into loaded | Vijay Pai | 2016-02-16 |
|\| | | | | |||
| | | | * | Make the poll override function assert on non-zero timeout if invoked | Vijay Pai | 2016-02-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from the end2end test thread itself (done by adding a TLS on that thread) Also clang-format | ||
| | | | * | Merge branch 'master' into poll_override2 | Vijay Pai | 2016-02-16 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| * | | | | Merge pull request #5201 from vjpai/alarm_openloop | David G. Quintas | 2016-02-16 |
| |\ \ \ \ | | | | | | | | | | | | | Revive and reform open-loop QPS testing | ||
| * \ \ \ \ | Merge pull request #5098 from a-veitch/base_log | Bogdan Drutu | 2016-02-16 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add Census base log | ||
| | | | | | * | Set up poll overrides | Vijay Pai | 2016-02-16 |
| | | | | | | | |||
| | | | | | * | Comment the requirements for changing grpc_poll_function and do | vjpai | 2016-02-15 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | poll overrides in such a way as to avoid polling races | ||
| | | * | | | Fix the timeout | Vijay Pai | 2016-02-13 |
| | | | | | | |||
| | | * | | | Merge remote-tracking branch 'upstream/master' into alarm_openloop | Vijay Pai | 2016-02-13 |
| | | | | | | |||
| | | * | | | use timeouts with proper fixture multipliers rather than raw, | Vijay Pai | 2016-02-13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since tsan slows things down a lot and may complicate issues such as shutdown. | ||
| * | | | | | 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 | ||
| | | | * \ \ | Merge branch 'master' into alarm_openloop | Vijay Pai | 2016-02-12 |
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | |||
* | | | | | | | Add 70% load scenario for testing with open-loop | Vijay Pai | 2016-02-12 |
| | | | | | | | |||
* | | | | | | | Merge branch 'alarm_openloop' into loaded | Vijay Pai | 2016-02-12 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | | |||
| * | | | | | clang-format | Vijay Pai | 2016-02-12 |
| | | | | | | |||
| * | | | | | Attack of the const police. | vjpai | 2016-02-12 |
| | | | | | | | | | | | | | | | | | | | | | | | | I also added some unrequested const's | ||
| | | | * | | Merge remote-tracking branch 'upstream/master' into inherit_from_grpc_library | yang-g | 2016-02-12 |
| | | | |\ \ | |_|_|_|/ / |/| | | | | | |||
* | | | | | | Merge github.com:grpc/grpc into bad_metadata | Craig Tiller | 2016-02-12 |
|\ \ \ \ \ \ | |||
| | | * | | | | Don't fail distrib test if a static server is running | murgatroid99 | 2016-02-12 |
| | | | | | | | |||
| * | | | | | | Merge pull request #5052 from ctiller/compress | David G. Quintas | 2016-02-11 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix race condition in transport API | ||
| * | | | | | | | 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 | ||
| | | | * \ \ \ \ | Merge branch 'master' into alarm_openloop | Vijay Pai | 2016-02-11 |
| | | | |\ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||
| | | | | | * | | | c99 comments | Alistair Veitch | 2016-02-11 |
| | | | | | | | | | |||
| * | | | | | | | | Merge pull request #5193 from vjpai/alarm_mods | Craig Tiller | 2016-02-11 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Make C++ alarm class usable and testable | ||
| | | | | * | | | | | Cleanup to make it work with clang build | Vijay Pai | 2016-02-11 |
| | | | | | | | | | | |||
| * | | | | | | | | | Merge pull request #5205 from grpc/release-0_13 | Craig Tiller | 2016-02-11 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | Release 0.13 upmerge. |