aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
| | | | | | | | | * | | | | | | 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
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | user-agent string filteringGravatar Muxi Yan2017-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.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #10819 from jtattermusch/fix_cpp_distribGravatar Jan Tattermusch2017-04-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix C++ distribtest
| | | | | | | | | | | | | | | | * \ \ Merge pull request #10825 from murgatroid99/node_only_uvGravatar Michael Lumish2017-04-27
| | | | | | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove non-libuv code from Node extension
| * | | | | | | | | | | | | | | | \ \ \ Merge pull request #10427 from ctiller/c++lameGravatar Craig Tiller2017-04-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert Lame Client Channel code to C++
| * | | | | | | | | | | | | | | | | | | | Update macOS install instructionsGravatar Mehrdad Afshari2017-04-27
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | * | Fix C/C++ test filteringGravatar Matt Kwong2017-04-27
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | * | Add test filtering to performance pull requestsGravatar Matt Kwong2017-04-27
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | * | Extend time capping to run_tests_matrix scriptsGravatar Craig Tiller2017-04-27
| | | | | | | | | | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | |/| |
| * | | | | | | | | | | | | | | | | | | Merge pull request #10877 from jtattermusch/fix_sc_formattingGravatar Jan Tattermusch2017-04-27
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix security_connector.c formatting
| | * | | | | | | | | | | | | | | | | | | fix security_connector.c formattingGravatar Jan Tattermusch2017-04-27
| |/ / / / / / / / / / / / / / / / / / /
| | | | | | | | * / / / / / / / / / / / Bazel rule for building grpc_cli.Gravatar Ivan Vučica2017-04-27
| | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge pull request #10772 from jboeuf/http2_cipher_suitesGravatar jboeuf2017-04-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing cipher suites blacklisted in HTTP2.
| | * | | | | | | | | | | | | | | | | | Removing cipher suites blacklisted in HTTP2.Gravatar Julien Boeuf2017-04-26
| |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://httpwg.org/specs/rfc7540.html#BadCipherSuites
| * | | | | | | | | | | | | | | | | | Merge pull request #10627 from jboeuf/more_ssl_factory_cleanupGravatar jboeuf2017-04-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more TLS cleanup.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #10855 from matt-kwong/fix_filterGravatar Matt Kwong2017-04-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | Fix test filtering for C/C++
| | | | | | | | | * | | | | | | | | | | Update performance VM init scriptGravatar Matt Kwong2017-04-26
| | | | | | | | | | |_|_|/ / / / / / / | | | | | | | | | |/| | | | | | | | |
| | | | | | | | | | | * | | | | | | | Added verbose option to run_interop_test to ease tracing the commands invokedGravatar Yong Ni2017-04-26
| | |_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | * | | Merge pull request #10847 from matt-kwong/cherry-pick_max_timeGravatar Matt Kwong2017-04-26
| | | | | | | | | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-pick: Allow specifying a maximum run time to run_tests
| | | | | | | | | | | | | | | | | * | Remove extra header from node_grpc.ccGravatar murgatroid992017-04-26
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | * | Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uvGravatar murgatroid992017-04-26
| | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | |_|/ / | | | | | | | | | | | | | | | |/| | |
| | | | * | | | | | | | | | | | | | | Merge github.com:grpc/grpc into c++lameGravatar Craig Tiller2017-04-26
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | * | | | Merge pull request #10871 from apolcyn/revert_merge_from_master_into_13xGravatar David G. Quintas2017-04-26
| | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'master' into v1.3.x"
| | | | | | | | | | | | | | | | * | | | Revert "Merge branch 'master' into v1.3.x"Gravatar Alexander Polcyn2017-04-26
| | | | | | | | | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 79759fea1abd09102d38af3e13a84b69e898124b, reversing changes made to dc36f4df6aba60275a31227e1d29c4d20b6cadca.
| * | | | | | | | | | | | | | | | | | Merge pull request #10823 from ncteisen/client-auth-filter-fuzzGravatar Noah Eisen2017-04-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't Abort on Input
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #10867 from nathanielmanistaatgoogle/2.7-and-laterGravatar Nathaniel Manista2017-04-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | src/python/grpcio/README.rst clean-up.
| | | | | | | | | * | | | | | | | | | | | Fix for recent cmake failure owing to gmockGravatar Mahak Mukhi2017-04-26
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge pull request #10805 from dgquintas/g_for_1.4.xGravatar David G. Quintas2017-04-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated g meaning for 1.4.x
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #10629 from kuscsik/build_fixGravatar Vijay Pai2017-04-26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | core: fix duplicated definition
| * | | | | | | | | | | | | | | | | | | | | Expand allowable resource quota failures: unavailable seems saneGravatar Craig Tiller2017-04-26
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | What was once Mac OS X is now called macOSGravatar Nathaniel Manista2017-04-26
| | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Drop Python 2.7-only implicationGravatar Nathaniel Manista2017-04-26
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | more TLS cleanup.Gravatar Julien Boeuf2017-04-26
| | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - using NULL-terminated strings as opposed to const unsigned char * with length since the credentials are in PEM format. - aligning the structures with gRPC so that we have less convertions to do back and forth.
| | | | | | | | * | | | | | | | | | | Merge branch 'master' into new_tsiGravatar jiangtaoli20162017-04-26
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Print before commenting to ensure theres A copy of the results somewhereGravatar Craig Tiller2017-04-26
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | Regenerate projectsGravatar Craig Tiller2017-04-26
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | clang-formatGravatar Craig Tiller2017-04-26
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Use larger block size in proto writeGravatar Craig Tiller2017-04-26
| | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | Fix C/C++ test filteringGravatar Matt Kwong2017-04-26
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | core, avl: rename static functionsGravatar Zoltan Kuscsik2017-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed remove and add static functions to remove_key and add_key
* | | | | | | | | | | | | | | | | | Add cronet_compression workaround filterGravatar Muxi Yan2017-04-25
| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into ↵Gravatar Noah Eisen2017-04-25
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client-auth-filter-fuzz
| | | | | | | * | | | | | | | | | | Merge branch 'master' into new_tsiGravatar jiangtaoli20162017-04-25
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |