Commit Graph

1863 Commits

Author SHA1 Message Date
David Garcia Quintas 1775ef91d2 Version bump to 1.6 2017-08-16 21:01:30 -07:00
David Garcia Quintas 713597f1cd Master version bump to 1.7.x 2017-08-16 20:59:05 -07:00
jiangtaoli2016 25d6fd82d1 split tsi library into two 2017-08-09 11:15:04 -07:00
jiangtaoli2016 32f66e8a81 Update build rule 2017-08-07 13:33:37 -07:00
Jiangtao Li 0211cfb277 Revert "Revert "Add TSI zero-copy frame protector"" 2017-08-07 11:24:07 -07:00
Jiangtao Li f5504a3e43 Revert "Add TSI zero-copy frame protector" 2017-08-07 10:48:46 -07:00
jiangtaoli2016 72eeb3c6dd split tsi into two libraries: tsi_interface and tsi 2017-08-04 14:40:51 -07:00
jiangtaoli2016 f3f7d3ba6c Merge branch 'master' into tsi_grpc 2017-08-04 13:45:38 -07:00
Nathaniel Manista 06b3f4dd5e Merge pull request #11964 from nathanielmanistaatgoogle/grpc_testing
gRPC Python test infrastructure.
2017-08-04 08:13:50 -07:00
Nathaniel Manista 2010985ab2 gRPC Python test infrastructure
(The channel-related second part of it.)
2017-08-03 22:38:40 +00:00
Mark D. Roth f9bf428489 Add support for service configs to c-ares resolver. 2017-08-03 14:47:23 -07:00
jiangtaoli2016 3aaa5ea028 minor fix 2017-08-02 13:36:50 -07:00
jiangtaoli2016 7001bc279b Add TSI zero-copy frame protector 2017-07-28 18:26:21 -07:00
ncteisen fb193a1e2f Merge branch 'master' of https://github.com/grpc/grpc into flow-control-v3 2017-07-28 15:47:32 -07:00
Nathaniel Manista b414268580 Merge pull request #11901 from nathanielmanistaatgoogle/grpc_testing
gRPC Python test infrastructure.
2017-07-25 19:29:32 -07:00
Ken Payson 9c420447fa Add classifiers to package details 2017-07-25 12:06:46 -07:00
Nathaniel Manista 69b7231776 gRPC Python test infrastructure
(The time-related first part of it, anyway.)
2017-07-25 18:19:35 +00:00
Craig Tiller 2014a37a5c Fix projects 2017-07-21 15:36:11 -07:00
Craig Tiller 4deeb65805 Merge github.com:grpc/grpc into grpc_millis 2017-07-20 09:50:25 -07:00
Craig Tiller b89304652b Build simplification 2017-07-19 16:24:19 -07:00
ncteisen 268a82398c Pull flow control into one module 2017-07-18 17:06:57 -07:00
Craig Tiller 280866817f Add a simple stats framework to gRPC C core 2017-07-18 14:22:19 -07:00
Mark D. Roth ea8f591b9d Merge pull request #11607 from yihuazhang/tsi_init
Add GTS plugin
2017-07-18 07:38:30 -07:00
Nathaniel Manista be803dc687 Merge pull request #11859 from nathanielmanistaatgoogle/gitignore
Narrow src/python/.gitignore to only what it needs to ignore.
2017-07-17 17:15:27 -07:00
Craig Tiller c0df1c0f9a Compiling again 2017-07-17 16:12:33 -07:00
Nathaniel Manista 1c0b20dda7 Narrow .gitignore to only what it needs to ignore
"proto" and "*.egg-info/" are no longer generated, "src/" can be
narrowed to "/src/", and "*_pb2.py" and "*_pb2_grpc.py" are covered by
.gitignore files in parent directories.
2017-07-17 20:30:32 +00:00
Yihua Zhang 1435bfc718 Add GTS plugin 2017-07-17 11:20:51 -07:00
Muxi Yan 0086d02161 Merge pull request #11189 from muxi/stream_compression
Implement stream compression lib module
2017-07-17 11:10:41 -07:00
Craig Tiller d996379030 Reset OWNERS state 2017-07-17 10:54:07 -07:00
Vijay Pai fd82a6cb4f Merge pull request #11145 from vjpai/inproc3
In-process transport
2017-07-15 20:05:26 -07:00
Vijay Pai 3d7d5f4ed2 Create inproc transport, add relevant tests, exclude irrelevant tests 2017-07-14 16:23:54 -07:00
Nicolas "Pixel" Noble 46569f238c Adding a few owners for /src/python/grpcio/grpc_core_dependencies.py 2017-07-14 17:41:47 +02:00
Mehrdad Afshari 76a316cb1f Add `set noparent` to Python OWNER files 2017-07-13 16:19:17 -07:00
Mehrdad Afshari b03e5cbb0f Add @mehrdada to python OWNERS 2017-07-13 16:09:22 -07:00
Nicolas Noble 9877189e45 Merge pull request #11310 from nicolasnoble/import
Import mutations.
2017-07-13 13:39:58 -07:00
Craig Tiller e476f7d33f Strawman OWNERS --> CODEOWNERS script 2017-07-13 08:52:00 -07:00
Mehrdad Afshari 2ca8282846 Merge pull request #11738 from mehrdada/canonica-urls
Use https://grpc.io consistently as the canonical URL
2017-07-11 11:41:14 -07:00
Ken Payson a4710a090d Revert "Remove lockfree-stack implementation that is no longer used"
This reverts commit 3d04e025bc.
2017-07-10 16:49:59 -07:00
Mehrdad Afshari bb3d95b643 Use https://grpc.io consistently as the canonical URL 2017-07-10 22:24:28 +00:00
Mehrdad Afshari 976eb7c4b4 Fetch grpc.io/release over https 2017-07-10 15:07:33 -07:00
Robert Bradshaw b0d6f115dc Remove declaration of missing field. 2017-07-10 10:33:23 -07:00
Muxi Yan e87a7e1a47 Move stream_compression to src/core/lib/compression 2017-07-05 10:09:03 -07:00
Muxi Yan c1f837ce79 Make stream compression module 2017-07-05 10:08:58 -07:00
Nicolas "Pixel" Noble 5d80dc4985 Merge branch 'master' of https://github.com/grpc/grpc into import 2017-06-26 22:01:11 +02:00
Nathaniel Manista 6613f60166 Enable wrong-import-order lint 2017-06-24 21:13:24 +00:00
Nathaniel Manista 37c83ffbed Enable redefined-variable-type lint 2017-06-24 21:03:21 +00:00
kpayson64 9cd18311a0 Merge pull request #11412 from kpayson64/upgrade_boringssl
Upgrade boringssl
2017-06-20 12:09:21 -07:00
Vijay Pai 3d04e025bc Remove lockfree-stack implementation that is no longer used 2017-06-19 15:32:44 -07:00
Ken Payson f8d6fb7a94 Update boringssl 2017-06-15 17:35:58 -07:00
Mehrdad Afshari 8fd84cfa07 Update python reflection tests to cover the higher level API 2017-06-13 14:14:07 -07:00
Craig Tiller dc16855649 Merge pull request #11336 from ctiller/ALL-the-things
Roll-up of threading changes
2017-06-08 16:03:36 -07:00
Yuchen Zeng 8f3d02106b Merge pull request #11237 from y-zeng/srv_record
Support grpclb address in the c-ares resolver
2017-06-08 13:17:02 -07:00
Craig Tiller b3899fd18b Merge github.com:grpc/grpc into ALL-the-things 2017-06-08 07:54:10 -07:00
Jan Tattermusch 4d5c3102a1 fix remaining license notices 2017-06-08 11:22:41 +02:00
Jan Tattermusch 7897ae9308 auto-fix most of licenses 2017-06-08 11:22:41 +02:00
Craig Tiller 1c8a90473d Merge github.com:grpc/grpc into ALL-the-things 2017-06-07 13:00:06 -07:00
David Garcia Quintas 87d5a3130d Implement LB policy updates 2017-06-06 19:45:58 -07:00
Yuchen Zeng b89b5011ec Merge remote-tracking branch 'upstream/master' into srv_record 2017-06-06 13:26:36 -07:00
Yuchen Zeng 4ebace71b0 Fix windows build, no_logging tests, dns_resolver_test 2017-06-05 20:47:02 -07:00
Craig Tiller 71005b169a Merge branch 'selectivity' into ALL-the-things 2017-06-02 14:36:41 -07:00
Mehrdad Afshari 5bc11d55d4 Expand pylint to grpc_health and grpc_reflection 2017-06-01 14:26:12 -07:00
David Garcia Quintas aebcdbd732 master bumped to 1.5.x 2017-05-30 14:14:27 -07:00
Michael Lumish 9baf4b19f0 Merge pull request #11309 from murgatroid99/master_1.3.x_upmerge
Master 1.3.x upmerge
2017-05-30 13:53:40 -07:00
Craig Tiller 7ebf31bcb2 Merge branch 'thread_pool' into ALL-the-things 2017-05-30 12:50:51 -07:00
Nicolas "Pixel" Noble 7bc55fdaa3 Merge remote-tracking branch 'ctiller/build-wtf' into import 2017-05-26 00:32:47 +02:00
murgatroid99 c18b9069cd Merge remote-tracking branch 'upstream/v1.3.x' into master_1.3.x_upmerge 2017-05-25 15:13:27 -07:00
kpayson64 0bd14cc89d Merge pull request #11306 from kpayson64/python_reflection
Fix Python reflection arguments
2017-05-25 13:15:42 -07:00
Ken Payson f3bb34935d Fix Python reflection arguments 2017-05-25 12:12:13 -07:00
Vizerai d74dbd3889 Merge branch 'master' of https://github.com/Vizerai/grpc into intrusive_hash_map 2017-05-23 14:10:10 -07:00
Jan Tattermusch bbfdbb19c0 bump version to 1.3.6 2017-05-23 22:48:45 +02:00
kpayson64 866190fab7 Merge pull request #11154 from kpayson64/hack_for_disconnects
Reconnect disconnected channels automatically
2017-05-22 11:07:51 -07:00
Ken Payson 8f7bc54ff2 Reconnect disconnected channels automatically 2017-05-22 10:07:25 -07:00
Ken Payson c0ce2cdf00 Update version to 1.3.5 2017-05-19 17:47:49 -07:00
Alexander Polcyn 92eb7fbc05 Bump to version 1.3.4 2017-05-18 11:49:15 -07:00
Craig Tiller 3085aa468e Merge github.com:grpc/grpc into thread_pool 2017-05-17 13:04:07 -07:00
Jan Tattermusch 90224ba893 Merge pull request #11113 from jtattermusch/python_artifact_polling_trace
Try fixing python artifact build on Windows
2017-05-17 09:05:57 +02:00
Craig Tiller 321b7d8fb0 Merge github.com:grpc/grpc into thread_pool 2017-05-16 13:42:07 -07:00
Muxi Yan a57d3c8120 Merge pull request #11138 from grpc/revert-11121-revert-10849-backward-compat
Revert "Revert "Implement Server Backward Compatibility""
2017-05-16 09:58:22 -07:00
Jan Tattermusch de030a35a2 regenerate projects 2017-05-16 18:20:26 +02:00
Ken Payson 16f76d2092 Bump to version 1.3.3 2017-05-16 08:54:22 -07:00
kpayson64 6b7f893b58 Merge pull request #11087 from kpayson64/update_python_auth
Update Python interop tests to use google-auth package
2017-05-15 23:34:47 -07:00
Craig Tiller a3eac51e1e Const correctness? for cython 2017-05-15 14:24:00 -07:00
Muxi Yan 29ff4665a8 Revert "Revert "Implement Server Backward Compatibility"" 2017-05-15 10:27:55 -07:00
Nicolas Noble 7edcce2147 Revert "Implement Server Backward Compatibility" 2017-05-12 15:35:20 -07:00
Muxi Yan a2d9d48a88 Merge pull request #10849 from muxi/backward-compat
Implement Server Backward Compatibility
2017-05-12 12:17:36 -07:00
Ken Payson 937d96d051 Update Python interop tests to use google-auth package
The oauth2client test dependency is still needed as it used by
the beta API unit tests.
2017-05-12 11:11:21 -07:00
Craig Tiller ee4b145213 Remove workqueue, covered_by_poller as concepts, get Mac build up 2017-05-12 10:56:03 -07:00
kpayson64 45b89fb11c Merge pull request #10993 from kpayson64/auth_context_python
Auth context python
2017-05-11 11:02:40 -07:00
Ken Payson 3ca8134514 Expose Auth Context in Python 2017-05-11 11:01:57 -07:00
Stanley Cheung 448a11d616 Bump to version 1.3.2 2017-05-10 15:23:29 -07:00
Craig Tiller a7785ba22e Merge github.com:grpc/grpc into uberpoll 2017-05-10 13:36:20 -07:00
kpayson64 449bf017e1 Merge pull request #11048 from kpayson64/fix_py_artifact
Fix python artifact build
2017-05-10 10:25:28 -07:00
Craig Tiller 6e86c463aa Merge github.com:grpc/grpc into uberpoll 2017-05-10 07:24:57 -07:00
Stanley Cheung 0afa9abb79 Bump to 1.3.2-pre1 2017-05-09 19:08:26 -07:00
Ken Payson b91c5fb8ba Fix python artifact build 2017-05-09 13:28:32 -07:00
kpayson64 a02b66a6cd Merge pull request #10995 from kpayson64/upgrade_protobuf
Upgrade protobuf to 3.3.0
2017-05-09 12:56:27 -07:00
Craig Tiller 581c0e479a Merge github.com:grpc/grpc into uberpoll 2017-05-09 08:19:13 -07:00
ncteisen fe9da0b80a Regain sanity 2017-05-08 18:13:20 -07:00
Ken Payson 029090628d Upgrade protobuf to 3.3.0 2017-05-08 12:18:12 -07:00
Craig Tiller d868a07d7c Merge github.com:grpc/grpc into uberpoll 2017-05-07 20:02:30 -07:00
Muxi Yan 3db618efe1 Merge remote-tracking branch 'upstream/master' into backward-compat 2017-05-05 13:32:43 -07:00
Craig Tiller 7188c9d05a Merge branch 'cq_limited_pollers' of github.com:sreecha/grpc into uberpoll 2017-05-05 13:27:02 -07:00
Sree Kuchibhotla 5a1a3b49f4 Separate this into a new poller 2017-05-05 13:14:45 -07:00
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
Craig Tiller 1f47730377 Fix deps between grpc and tracer system 2017-05-05 11:01:25 -07:00
Craig Tiller 924353a717 Finish merge, disable new pollers until they stabilize 2017-05-05 17:36:31 +00:00
Craig Tiller 18545a3e6a Merge branch 'epoll_thread_pool' of github.com:sreecha/grpc into uberpoll 2017-05-05 17:33:44 +00:00
Craig Tiller eda29c6398 Merge branch 'epex4' into uberpoll 2017-05-05 15:21:19 +00:00
Craig Tiller 7365ec95e4 Merge branch 'timer_pool' into uberpoll 2017-05-05 15:21:09 +00:00
Craig Tiller d6ff2f0bc9 Merge github.com:grpc/grpc into hiertune 2017-05-05 15:01:20 +00:00
Craig Tiller bc7c224cac Merge branch '0bug' into timer_pool 2017-05-04 22:02:42 +00:00
murgatroid99 572cd7e5a4 Update version to 1.3.1 2017-05-04 10:02:44 -07:00
Sree Kuchibhotla 1440b0654d Merge branch 'master' into epoll_thread_pool 2017-05-03 15:42:42 -07:00
kpayson64 c4eb0ff7ae Merge pull request #10913 from kpayson64/fix_python_interop
Interop fixes
2017-05-03 10:40:44 -07:00
Craig Tiller 4d03ffbdc6 Merge github.com:grpc/grpc into timer_pool 2017-05-03 07:57:53 -07:00
Craig Tiller 0bc3b40b76 Merge github.com:grpc/grpc into hiertune 2017-05-03 07:35:51 -07:00
Sree Kuchibhotla d4fc32eacd New epoll-based polling engine with dedicated poller threads 2017-05-02 15:32:22 -07:00
Craig Tiller c3571791a5 Isolate timer checking in its own thread 2017-05-02 14:36:33 -07:00
Vizerai 0d1825d4cc Merge branch 'master' of https://github.com/Vizerai/grpc into intrusive_hash_map 2017-05-02 11:17:23 -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
Craig Tiller c610985aeb Merge branch 'hiertune' into epex4+epoll1 2017-05-01 14:26:49 -07:00
Ken Payson 7e7ac1c60c Fix Python interop tests 2017-05-01 14:17:06 -07:00
Muxi Yan e123a05913 Merge remote-tracking branch 'upstream/master' into backward-compat 2017-04-30 21:16:07 -07:00
Vizerai 0359e1260f initial commit 2017-04-28 20:06:58 -07:00
Craig Tiller ebf3a89984 Merge github.com:grpc/grpc into epoll1+hierarchical-turnstile 2017-04-28 09:27:01 -07:00
David Garcia Quintas 606945af76 1.3.0 -> 1.3.1-pre1 2017-04-27 14:26:52 -07:00
David Garcia Quintas 3ef2355eae s/1.3.0-pre/1.3.0 2017-04-27 13:59:19 -07:00
Muxi Yan f63afec89d user-agent string filtering 2017-04-27 11:14:18 -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 c67cc999e3 Initial fork for singleton epoll poller 2017-04-27 10:15:51 -07:00
Craig Tiller ac99bfff46 Merge github.com:grpc/grpc into epex4 2017-04-27 09:27:20 -07:00
Craig Tiller 737da9fdea Merge github.com:grpc/grpc into c++lame 2017-04-26 15:07:09 -07:00
Alexander Polcyn f5521c33f9 Revert "Merge branch 'master' into v1.3.x"
This reverts commit 79759fea1a, reversing
changes made to dc36f4df6a.
2017-04-26 14:18:39 -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
Muxi Yan b53fd4df37 Add cronet_compression workaround filter 2017-04-25 17:04:29 -07:00
Craig Tiller 819cd88bd7 Allow EPOLLEXCLUSIVE tests to be omitted outside of CI 2017-04-25 13:18:22 -07: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
Craig Tiller 890b584ee9 Merge github.com:grpc/grpc into epex4 2017-04-24 19:33:53 +00:00
Craig Tiller 1fb0c39168 Merge github.com:grpc/grpc into epex4 2017-04-24 18:35:36 +00: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 3df4584b9c Merge github.com:grpc/grpc into epex4 2017-04-20 19:24:41 +00:00
Craig Tiller 7bc14b5dcf Merge github.com:grpc/grpc into epex4 2017-04-20 16:14:51 +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
Craig Tiller 26ec8fba7a Merge github.com:grpc/grpc into epex4 2017-04-17 08:38:33 -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
David Garcia Quintas d9986c3cf7 1.3.x branch cut 2017-04-13 16:20:56 -07:00
Craig Tiller cacaa1950d Merge github.com:grpc/grpc into epex3 2017-04-13 15:22:38 +00: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
Craig Tiller 440df1048a Merge github.com:grpc/grpc into minimal_test 2017-04-11 09:55:16 -07:00
Craig Tiller fb75b8d429 Merge github.com:grpc/grpc into epex3 2017-04-11 09:54:07 -07:00
Craig Tiller 6b99d80410 Merge pull request #10501 from ctiller/epex2
Split event notification out of ev_epoll_linux.c
2017-04-11 09:53:41 -07:00
Craig Tiller cfab1b8758 Merge pull request #52 from kpayson64/working_mac_py_cpp
Fix mac build
2017-04-10 17:01:06 -07:00
Ken Payson 3b90055f2c Fix mac build 2017-04-10 15:53:17 -07:00
jiangtaoli2016 e69881de7f Revise based on Mark's comments. 2017-04-10 14:45:23 -07:00
Craig Tiller eb36437e85 Merge github.com:grpc/grpc into c++lame 2017-04-07 17:08:42 -07:00
Craig Tiller 8ebb5443de Update build.yaml 2017-04-07 16:01:55 -07:00
Sree Kuchibhotla 7b9f97bfb8 Merge branch 'master' into cq_create_api_changes 2017-04-07 13:44:34 -07:00
Craig Tiller f4360d77d4 Fix build, fix epollex detection 2017-04-07 08:51:00 -07:00
Craig Tiller 5f399d173b Merge github.com:grpc/grpc into minimal_test 2017-04-07 06:46:08 -07:00
Sree Kuchibhotla a6ff103446 Merge branch 'master' into cq_create_api_changes 2017-04-06 13:09:17 -07:00
Craig Tiller 71d6ce65d4 Merge deadline_init/deadline_start 2017-04-06 09:10:09 -07:00
Craig Tiller a24b971214 Rename compress_filter --> message_compress_filter 2017-04-06 09:03:21 -07:00