Commit Graph

1345 Commits

Author SHA1 Message Date
Craig Tiller b3899fd18b Merge github.com:grpc/grpc into ALL-the-things 2017-06-08 07:54:10 -07: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
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
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
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
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
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
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
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
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
Mark D. Roth 09e458c6cd Implement client-side load reporting for grpclb. 2017-05-02 08:13:26 -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
jiangtaoli2016 6cb5e276a4 Merge branch 'master' into new_tsi 2017-04-24 09:02:11 -07:00
Craig Tiller decec09316 Merge github.com:grpc/grpc into c++lame 2017-04-21 08:08:05 -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 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
Craig Tiller 376887d213 Split event notification out of ev_epoll_linux.c 2017-04-06 08:27:03 -07:00
Jan Tattermusch 61f729fe1a Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_v12x 2017-04-06 17:11:44 +02:00
Craig Tiller 5de46568ce Merge github.com:grpc/grpc into cpparena 2017-04-04 17:08:12 -07:00
Craig Tiller ee787caf0e Merge github.com:grpc/grpc into truebin 2017-04-04 15:54:40 -07:00
Craig Tiller c8f62bcb03 Add new setting for true-binary mode 2017-04-03 16:25:45 -07:00
Craig Tiller 3be7dd0e79 Optionalize deadline checking 2017-04-03 14:30:03 -07:00
Craig Tiller af76743e33 Optionalize compress, gather all the http2 filter bits together in ext/ 2017-04-03 13:54:31 -07:00
Craig Tiller 9b3648a28e Optionalize message_size_filter 2017-04-03 12:25:19 -07:00
Jan Tattermusch 0be726b34d bump version to 1.2.2 2017-04-03 20:04:34 +02:00
Sree Kuchibhotla c1a32fa46e Merge branch 'master' into cq_create_api_changes 2017-04-01 17:36:15 -07:00
Craig Tiller 5f95f1a4ca Merge github.com:grpc/grpc into cpparena 2017-04-01 07:42:20 -07:00
Craig Tiller 6d4894e9d6 optionalize max_age 2017-03-31 17:22:06 -07:00
Craig Tiller 9eb0fdec00 Reorganize ext tree
- filters live under filters
- lb_policy, resolver implementations (being part of client_channel) live under client_channel
2017-03-31 16:59:30 -07:00
Craig Tiller 9c54a0c12c Merge pull request #10382 from ctiller/checks
Reinstate filegroup dependency checks, fix fallout
2017-03-31 16:10:35 -07:00
Yuchen Zeng 6715a15fe1 Merge pull request #10318 from y-zeng/server_channel_max_age
Max age for server channels
2017-03-31 10:59:04 -07:00
Craig Tiller dd36b15315 Call ref/unref, bugfixes 2017-03-31 08:27:28 -07:00
Sree Kuchibhotla e04906dc54 Merge branch 'master' into cq_create_api_changes 2017-03-30 13:20:00 -07:00
Craig Tiller 29b527fa30 Reinstate one check, fix fall out 2017-03-30 10:27:20 -07:00
Ken Payson 484871bb03 Bump version to 1.2.1 2017-03-28 18:00:33 -07:00