Commit Graph

1575 Commits

Author SHA1 Message Date
makdharma 20f2c43174 Merge pull request #10977 from makdharma/pydocfixit
Documentation fixes for python public API
2017-05-05 12:46:44 -07:00
Makarand Dharmapurikar eeb37cff4e Documentation fixes for python public API.
Contains squashed commits for several typo fixes and comments made during review.
2017-05-05 12:06:37 -07:00
kpayson64 c4eb0ff7ae Merge pull request #10913 from kpayson64/fix_python_interop
Interop fixes
2017-05-03 10:40:44 -07:00
Mark D. Roth 09e458c6cd Implement client-side load reporting for grpclb. 2017-05-02 08:13:26 -07:00
Nathaniel Manista 13cc172000 Merge pull request #7836 from thinkerou/delete_unuse_lib
Remove unused import in grpcio_health_checking.
2017-05-01 19:33:06 -07:00
Ken Payson 7e7ac1c60c Fix Python interop tests 2017-05-01 14:17:06 -07:00
David G. Quintas 8c71bde9b0 Merge pull request #10522 from jiangtaoli2016/new_tsi
Update TSI with new non-blocking TSI interfaces.
2017-04-27 10:42:33 -07:00
Craig Tiller 737da9fdea Merge github.com:grpc/grpc into c++lame 2017-04-26 15:07:09 -07:00
Nathaniel Manista b1faf02140 What was once Mac OS X is now called macOS 2017-04-26 20:07:58 +00:00
Nathaniel Manista ffc23ff17f Drop Python 2.7-only implication 2017-04-26 19:59:07 +00:00
jiangtaoli2016 812860850c Merge branch 'master' into new_tsi 2017-04-24 15:33:41 -07:00
Craig Tiller 6f2024f4ec Merge github.com:grpc/grpc into c++lame 2017-04-24 13:33:06 -07:00
jiangtaoli2016 6cb5e276a4 Merge branch 'master' into new_tsi 2017-04-24 09:02:11 -07:00
Craig Tiller d978a95d3c Merge github.com:grpc/grpc into hybrid 2017-04-24 08:20:03 -07:00
Craig Tiller decec09316 Merge github.com:grpc/grpc into c++lame 2017-04-21 08:08:05 -07:00
yang-g 03876f66e1 Fix http2_interop test for c++ and python 2017-04-20 14:51:58 -07:00
Craig Tiller 59db187c85 Merge branch 'tsan-c++' into hybrid 2017-04-20 19:24:57 +00:00
Craig Tiller 6984e1dc5e Merge github.com:grpc/grpc into c++lame 2017-04-19 14:50:31 -07:00
Craig Tiller 06a30eef36 Merge github.com:grpc/grpc into cpparena 2017-04-19 14:40:20 -07:00
Matt Kwong c602dde442 Keep _grpcio_metadata.py in GitHub repo 2017-04-18 12:10:36 -07:00
Craig Tiller c88094d64b Merge pull request #56 from kpayson64/working_mac_py_cpp
Working mac py cpp
2017-04-17 09:15:24 -07:00
Ken Payson 0eac8aa220 Yapf_code 2017-04-17 01:58:15 -07:00
Ken Payson 63b0d11ca8 Final changes 2017-04-17 00:03:40 -07:00
jiangtaoli2016 e223a6a042 Merge branch 'master' into new_tsi 2017-04-15 10:20:51 -07:00
Craig Tiller 78d92c8a1e Merge pull request #55 from kpayson64/working_mac_py_cpp
Working mac py cpp
2017-04-14 18:56:15 -07:00
Ken Payson ae5ca1b447 Fixes 2017-04-14 16:34:26 -07:00
Ken Payson 5b034e6a4f Windows + mac dbg fix 2017-04-14 16:25:51 -07:00
Craig Tiller d69115507e Merge branch 'c++lame' of github.com:ctiller/grpc into c++lame 2017-04-14 15:18:28 -07:00
Craig Tiller 56c23f11b0 Merge github.com:grpc/grpc into c++lame 2017-04-14 15:18:20 -07:00
Craig Tiller c3666d7090 Merge github.com:grpc/grpc into hybrid 2017-04-14 13:15:56 -07:00
Craig Tiller 2c6f63731c Merge github.com:grpc/grpc into cpparena 2017-04-14 13:14:10 -07:00
Craig Tiller b4a9b8e7a2 Merge pull request #54 from kpayson64/working_mac_py_cpp
Working mac py cpp
2017-04-14 13:09:49 -07:00
Sree Kuchibhotla b81fb794a3 Merge pull request #9972 from sreecha/cq_create_api_changes
Completion Queue creation API changes (C-Core and C++ only)
2017-04-14 07:59:18 -07:00
Craig Tiller 90bb7bddd1 Merge pull request #10449 from ctiller/minimal_test
Add a test of minimal stacks, and make it pass
2017-04-14 06:48:31 -07:00
Mehrdad Afshari b575394351 Use _pb2_grpc module to access gRPC entities 2017-04-13 23:27:58 -07:00
Craig Tiller 58e6d13f1b Merge github.com:grpc/grpc into minimal_test 2017-04-13 20:50:09 -07:00
Sree Kuchibhotla 0e5fa9ebcd Merge branch 'master' into cq_create_api_changes 2017-04-13 18:36:23 -07:00
Ken Payson 571c75aa33 Switch to Makefile based build on mac 2017-04-13 16:39:37 -07:00
David Garcia Quintas 9e1acc0796 master to 1.4.0-dev 2017-04-13 16:30:15 -07:00
Craig Tiller 28bb5c302f Merge github.com:grpc/grpc into c++lame 2017-04-13 06:58:28 -07:00
Craig Tiller 57e6485e2d Merge github.com:grpc/grpc into hybrid 2017-04-13 06:46:27 -07:00
Sree Kuchibhotla aa5a92800f Merge branch 'master' into cq_create_api_changes 2017-04-13 03:13:17 -07:00
Craig Tiller b3d308b9a1 Merge github.com:grpc/grpc into cpparena 2017-04-12 15:16:35 -07:00
Craig Tiller 80233bfde5 Merge github.com:grpc/grpc into minimal_test 2017-04-12 14:55:17 -07:00
Craig Tiller cd3ae4f33b Remove API 2017-04-12 14:19:23 -07:00
Craig Tiller f0721657ff Merge github.com:grpc/grpc into truebin 2017-04-12 08:41:29 -07:00
Craig Tiller c20fa90c60 Merge github.com:grpc/grpc into cpparena 2017-04-12 06:44:00 -07:00
Sree Kuchibhotla 4ef9ce7954 Merge branch 'master' into cq_create_api_changes 2017-04-11 14:48:19 -07:00
Craig Tiller acce275281 Merge github.com:grpc/grpc into c++lame 2017-04-11 10:46:35 -07:00
jiangtaoli2016 70928f0722 Merge branch 'master' into new_tsi 2017-04-11 10:07:01 -07:00