Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | | | | | | | | * | | Add static method to generated code to return fully qualified protobuf ↵ | James Eady | 2017-05-02 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | service name. | |||
| | | | | * | | | | | | | fix Windows cmake build on internal_ci | Jan Tattermusch | 2017-05-02 | |
| | | | | | | | | | | | | ||||
| | | | | * | | | | | | | add --internal_ci for windows | Jan Tattermusch | 2017-05-02 | |
| |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||
| | | | * | | | | | | | add macos grpc_master.sh job | Jan Tattermusch | 2017-05-02 | |
| |_|_|/ / / / / / / |/| | | | | | | | | | ||||
| | | | * | | | | | | fix truncate bug in grpc_cli | zhimingxie | 2017-05-02 | |
| |_|_|/ / / / / / |/| | | | | | | | | ||||
* | | | | | | | | | Merge pull request #10921 from jtattermusch/internal_ci_better_reports | Jan Tattermusch | 2017-05-02 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Better presentation of reports in internal CI | |||
| | | * | | | | | | | add C# generic insecure scenarios | Jan Tattermusch | 2017-05-02 | |
| | | | | | | | | | | ||||
| | | * | | | | | | | reports GC stats in qps workers | Jan Tattermusch | 2017-05-02 | |
| |_|/ / / / / / / |/| | | | | | | | | ||||
* | | | | | | | | | Merge pull request #10360 from dgquintas/grpclb_new_test | David G. Quintas | 2017-05-02 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | New version of grpclb end2end test | |||
* \ \ \ \ \ \ \ \ \ | Merge pull request #7836 from thinkerou/delete_unuse_lib | Nathaniel Manista | 2017-05-01 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Remove unused import in grpcio_health_checking. | |||
* \ \ \ \ \ \ \ \ \ \ | Merge pull request #10862 from makroiss/patch-1 | Nathaniel Manista | 2017-05-01 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | Fix imports in generated gRPC Python code. | |||
| | | | | | | * | | | | Merge remote-tracking branch 'upstream/master' into fix_python_interop | Ken Payson | 2017-05-01 | |
| | | | | | | |\ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||
| | | | | * | | | | | | Reintroduce a lambda capture as part of C++11-izing code | Vijay Pai | 2017-05-01 | |
| |_|_|_|/ / / / / / |/| | | | | | | | | | ||||
| | | | | | | | * | | Merge branch 'master' of github.com:grpc/grpc into trying-to-fix-stuff | David Garcia Quintas | 2017-05-01 | |
| | | | | | | | |\ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | ||||
* | | | | | | | | | | Merge pull request #10924 from ctiller/not-ld | Craig Tiller | 2017-05-01 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix printf format | |||
* \ \ \ \ \ \ \ \ \ \ | Merge pull request #10896 from ctiller/sbtest | Craig Tiller | 2017-05-01 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix bogus asserts | |||
| | | | | | | | * | | | | Fix Python interop tests | Ken Payson | 2017-05-01 | |
| | | | | | | | |/ / / | ||||
| | | | | * | | | | | | Apply slowdown factor to timeouts | David Garcia Quintas | 2017-05-01 | |
| | | | | | | | | | | | ||||
* | | | | | | | | | | | Merge pull request #10933 from dgquintas/thrift_again | David G. Quintas | 2017-05-01 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | Remove leftover thrift mentions | |||
| * | | | | | | | | | | Remove leftover thrift mentions | David Garcia Quintas | 2017-05-01 | |
|/ / / / / / / / / / | ||||
| | | | | * | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_new_test | David Garcia Quintas | 2017-05-01 | |
| | | | | |\ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | ||||
* | | | | | | | | | | Merge pull request #10687 from makdharma/fixbazel | makdharma | 2017-05-01 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | .proto and BUILD files can now in differnt dirs | |||
| | | * | | | | | | | | Fix printf format | Craig Tiller | 2017-04-29 | |
| |_|/ / / / / / / / |/| | | | | | | | | | ||||
| | | | | | | * | | | use run_tests_matrix.py for running internal_ci master tests | Jan Tattermusch | 2017-04-29 | |
| |_|_|_|_|_|/ / / |/| | | | | | | | | ||||
| | | | | | * | | | reports can create subdirs | Jan Tattermusch | 2017-04-29 | |
| |_|_|_|_|/ / / |/| | | | | | | | ||||
| | | | | | * | | Regen project files. | David Garcia Quintas | 2017-04-28 | |
| | | | | | | | | ||||
| | | | | | * | | Merge branch 'v1.3.x' into trying-to-fix-stuff | David Garcia Quintas | 2017-04-28 | |
| | | | | | |\ \ | ||||
| | | | | | * | | | Clang format | murgatroid99 | 2017-04-28 | |
| | | | | | | | | | ||||
| | | | | | * | | | Remove another instance of '#ifdef GRPC_UV' from Node extension | murgatroid99 | 2017-04-28 | |
| | | | | | | | | | ||||
| | | | | | * | | | Merge commit '3049460b75ac557348243601896ed68ca8145522' into ↵ | David Garcia Quintas | 2017-04-28 | |
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-upmerge-v1.3.x | |||
| | | | | | * | | | | Merge branch 'v1.3.x' into master-upmerge-v1.3.x | David Garcia Quintas | 2017-04-28 | |
| |_|_|_|_|/| | | | |/| | | | | | | | | | ||||
* | | | | | | | | | | Merge pull request #10873 from yongni/master | yongni | 2017-04-28 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Added verbose option to run_interop_test to ease tracing the commands… | |||
* \ \ \ \ \ \ \ \ \ \ | Merge pull request #10911 from dgquintas/remove_thrift | David G. Quintas | 2017-04-28 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Removed 3rd party dep on thrift | |||
| | | | | | | | | | * \ | Merge pull request #10895 from dgquintas/v1.3.x-post-tag-bump | David G. Quintas | 2017-04-28 | |
| | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.3.0 -> 1.3.1-pre1 | |||
| * | | | | | | | | | | | | Removed 3rd party dep on thrift | David Garcia Quintas | 2017-04-28 | |
| | | | | | | | | | | | | | ||||
| | | | | | | * | | | | | | BUILD and #include fixes | David Garcia Quintas | 2017-04-28 | |
| | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge pull request #10901 from grpc/vjpai-patch-2 | Vijay Pai | 2017-04-28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add gflags to Mac build from source instructions | |||
| * | | | | | | | | | | | | | Add gflags to Mac build from source instructions | Vijay Pai | 2017-04-28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that gflags is already listed as something to install under Linux before build from source and running tests but was not included on Mac. | |||
* | | | | | | | | | | | | | | Merge pull request #10824 from ctiller/proxy2 | Craig Tiller | 2017-04-28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix potential memory leak, cleanup some code | |||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #9376 from ivucica/ivucica_grpc_cli | Jan Tattermusch | 2017-04-28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | Bazel build rule for //test/cpp/util:grpc_cli | |||
* | | | | | | | | | | | | | | | Merge pull request #10874 from matt-kwong/perf-create-script | Matt Kwong | 2017-04-27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update performance VM init script | |||
| | | | | | | | | | * | | | | | | New version of grpclb end2end test | David Garcia Quintas | 2017-04-27 | |
| |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | ||||
| | | | | | | | * | | | | | | | Fix python imports in gRPC generated python code | Manuel Kroiss | 2017-04-27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the import style for proto dependencies from a) to b). a) "import a.b.c as x" b) "from a.b import c as x" Using statement a) causes problems when using __init__ files. If module "a.b" has an __init__.py file which is importing the python generated grpc code "a.b.d", then we cannot import a module named "a.b.c" because the module "a.b" does not exist yet. In this case python will throw: AttributeError: 'module' object has no attribute 'b' This PR adapts the code to use the same logic as in: /google/protobuf/compiler/python/python_generator.cc | |||
| | | | | | | * | | | | | | | | Fix bogus asserts | Craig Tiller | 2017-04-27 | |
| |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | Merge pull request #10613 from ctiller/framing_costs | Craig Tiller | 2017-04-27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize framing a little | |||
| | | | | | | | | | | | | * | | 1.3.0 -> 1.3.1-pre1 | David Garcia Quintas | 2017-04-27 | |
| | | | | | | | | | | | |/ / | ||||
* | | | | | | | | | | | | | | Merge pull request #10869 from MakMukhi/cmake_fix | MakMukhi | 2017-04-27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for recent cmake failure owing to gmock | |||
| | | | | | | | | | | | | * | | s/1.3.0-pre/1.3.0 | David Garcia Quintas | 2017-04-27 | |
| | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | * | | Merge pull request #10884 from matt-kwong/fix_1.3.x_tests | Matt Kwong | 2017-04-27 | |
| | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-pick: fix Jenkins testing 1.3.x | |||
* | | | | | | | | | | | | | \ \ | Merge pull request #10522 from jiangtaoli2016/new_tsi | David G. Quintas | 2017-04-27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update TSI with new non-blocking TSI interfaces. |