aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
| | | | | | | | | | * | Add static method to generated code to return fully qualified protobuf ↵Gravatar James Eady2017-05-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | service name.
| | | | | * | | | | | | fix Windows cmake build on internal_ciGravatar Jan Tattermusch2017-05-02
| | | | | | | | | | | |
| | | | | * | | | | | | add --internal_ci for windowsGravatar Jan Tattermusch2017-05-02
| |_|_|_|/ / / / / / / |/| | | | | | | | | |
| | | | * | | | | | | add macos grpc_master.sh jobGravatar Jan Tattermusch2017-05-02
| |_|_|/ / / / / / / |/| | | | | | | | |
| | | | * | | | | | fix truncate bug in grpc_cliGravatar zhimingxie2017-05-02
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #10921 from jtattermusch/internal_ci_better_reportsGravatar Jan Tattermusch2017-05-02
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Better presentation of reports in internal CI
| | | * | | | | | | add C# generic insecure scenariosGravatar Jan Tattermusch2017-05-02
| | | | | | | | | |
| | | * | | | | | | reports GC stats in qps workersGravatar Jan Tattermusch2017-05-02
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #10360 from dgquintas/grpclb_new_testGravatar David G. Quintas2017-05-02
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | New version of grpclb end2end test
* \ \ \ \ \ \ \ \ \ Merge pull request #7836 from thinkerou/delete_unuse_libGravatar Nathaniel Manista2017-05-01
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove unused import in grpcio_health_checking.
* \ \ \ \ \ \ \ \ \ \ Merge pull request #10862 from makroiss/patch-1Gravatar Nathaniel Manista2017-05-01
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | Fix imports in generated gRPC Python code.
| | | | | | | * | | | Merge remote-tracking branch 'upstream/master' into fix_python_interopGravatar Ken Payson2017-05-01
| | | | | | | |\ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| | | | | * | | | | | Reintroduce a lambda capture as part of C++11-izing codeGravatar Vijay Pai2017-05-01
| |_|_|_|/ / / / / / |/| | | | | | | | |
| | | | | | | | * | Merge branch 'master' of github.com:grpc/grpc into trying-to-fix-stuffGravatar David Garcia Quintas2017-05-01
| | | | | | | | |\ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #10924 from ctiller/not-ldGravatar Craig Tiller2017-05-01
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix printf format
* \ \ \ \ \ \ \ \ \ \ Merge pull request #10896 from ctiller/sbtestGravatar Craig Tiller2017-05-01
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix bogus asserts
| | | | | | | | * | | | Fix Python interop testsGravatar Ken Payson2017-05-01
| | | | | | | | |/ / /
| | | | | * | | | | | Apply slowdown factor to timeoutsGravatar David Garcia Quintas2017-05-01
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #10933 from dgquintas/thrift_againGravatar David G. Quintas2017-05-01
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | Remove leftover thrift mentions
| * | | | | | | | | | Remove leftover thrift mentionsGravatar David Garcia Quintas2017-05-01
|/ / / / / / / / / /
| | | | | * | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_new_testGravatar David Garcia Quintas2017-05-01
| | | | | |\ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #10687 from makdharma/fixbazelGravatar makdharma2017-05-01
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | .proto and BUILD files can now in differnt dirs
| | | * | | | | | | | Fix printf formatGravatar Craig Tiller2017-04-29
| |_|/ / / / / / / / |/| | | | | | | | |
| | | | | | | * | | use run_tests_matrix.py for running internal_ci master testsGravatar Jan Tattermusch2017-04-29
| |_|_|_|_|_|/ / / |/| | | | | | | |
| | | | | | * | | reports can create subdirsGravatar Jan Tattermusch2017-04-29
| |_|_|_|_|/ / / |/| | | | | | |
| | | | | | * | Regen project files.Gravatar David Garcia Quintas2017-04-28
| | | | | | | |
| | | | | | * | Merge branch 'v1.3.x' into trying-to-fix-stuffGravatar David Garcia Quintas2017-04-28
| | | | | | |\ \
| | | | | | * | | Clang formatGravatar murgatroid992017-04-28
| | | | | | | | |
| | | | | | * | | Remove another instance of '#ifdef GRPC_UV' from Node extensionGravatar murgatroid992017-04-28
| | | | | | | | |
| | | | | | * | | Merge commit '3049460b75ac557348243601896ed68ca8145522' into ↵Gravatar David Garcia Quintas2017-04-28
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-upmerge-v1.3.x
| | | | | | * | | | Merge branch 'v1.3.x' into master-upmerge-v1.3.xGravatar David Garcia Quintas2017-04-28
| |_|_|_|_|/| | | | |/| | | | | | | | |
* | | | | | | | | | Merge pull request #10873 from yongni/masterGravatar yongni2017-04-28
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Added verbose option to run_interop_test to ease tracing the commands…
* \ \ \ \ \ \ \ \ \ \ Merge pull request #10911 from dgquintas/remove_thriftGravatar David G. Quintas2017-04-28
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Removed 3rd party dep on thrift
| | | | | | | | | | * \ Merge pull request #10895 from dgquintas/v1.3.x-post-tag-bumpGravatar David G. Quintas2017-04-28
| | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | 1.3.0 -> 1.3.1-pre1
| * | | | | | | | | | | | Removed 3rd party dep on thriftGravatar David Garcia Quintas2017-04-28
| | | | | | | | | | | | |
| | | | | | | * | | | | | BUILD and #include fixesGravatar David Garcia Quintas2017-04-28
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #10901 from grpc/vjpai-patch-2Gravatar Vijay Pai2017-04-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add gflags to Mac build from source instructions
| * | | | | | | | | | | | | Add gflags to Mac build from source instructionsGravatar Vijay Pai2017-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/proxy2Gravatar Craig Tiller2017-04-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix potential memory leak, cleanup some code
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #9376 from ivucica/ivucica_grpc_cliGravatar Jan Tattermusch2017-04-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | Bazel build rule for //test/cpp/util:grpc_cli
* | | | | | | | | | | | | | | Merge pull request #10874 from matt-kwong/perf-create-scriptGravatar Matt Kwong2017-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update performance VM init script
| | | | | | | | | | * | | | | | New version of grpclb end2end testGravatar David Garcia Quintas2017-04-27
| |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |
| | | | | | | | * | | | | | | Fix python imports in gRPC generated python codeGravatar Manuel Kroiss2017-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 assertsGravatar Craig Tiller2017-04-27
| |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #10613 from ctiller/framing_costsGravatar Craig Tiller2017-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize framing a little
| | | | | | | | | | | | | * | 1.3.0 -> 1.3.1-pre1Gravatar David Garcia Quintas2017-04-27
| | | | | | | | | | | | |/ /
* | | | | | | | | | | | | | Merge pull request #10869 from MakMukhi/cmake_fixGravatar MakMukhi2017-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for recent cmake failure owing to gmock
| | | | | | | | | | | | | * | s/1.3.0-pre/1.3.0Gravatar David Garcia Quintas2017-04-27
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | Merge pull request #10884 from matt-kwong/fix_1.3.x_testsGravatar Matt Kwong2017-04-27
| | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-pick: fix Jenkins testing 1.3.x
* | | | | | | | | | | | | | \ \ Merge pull request #10522 from jiangtaoli2016/new_tsiGravatar David G. Quintas2017-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update TSI with new non-blocking TSI interfaces.