Commit Graph

539 Commits

Author SHA1 Message Date
Stanley Cheung af525b3a26 PHP: windows config.w32 file 2017-05-19 20:00:06 -07:00
Stanley Cheung ff0e429672 Merge pull request #11198 from stanley-cheung/upmerge-v1_3_2-to-master
Upmerge v1.3.x branch to master
2017-05-18 07:59:24 -07:00
Stanley Cheung ebeda85eb8 Upmerge from v1.3.x branch to master 2017-05-17 19:34:47 -07:00
Stanley Cheung d15f5c015a PHP: fix pecl extension reported version 2017-05-17 13:21:05 -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
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
Muxi Yan 1d3ce9a737 Move workaround_list to grpc_base 2017-05-15 16:27:37 -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
Stanley Cheung 448a11d616 Bump to version 1.3.2 2017-05-10 15:23:29 -07:00
Stanley Cheung 57c0255bf8 Merge pull request #11005 from stanley-cheung/php-fix-memory-leaks
PHP: fixed some memory leaks
2017-05-10 12:36:45 -07:00
Stanley Cheung 0afa9abb79 Bump to 1.3.2-pre1 2017-05-09 19:08:26 -07:00
Stanley Cheung e9595bad14 PHP: fixed some memory leaks 2017-05-09 15:45:06 -07:00
Muxi Yan 937dba3ea1 Put workaround list somewhere accessable by wrapping languages 2017-05-09 14:45:44 -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
Michael Lumish 712ea0ac87 Merge pull request #10990 from murgatroid99/version_1.3.1_bump
Update version to 1.3.1
2017-05-05 12:52:25 -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
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
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
Stanley Cheung 19792108ae PHP: release 1.3, disable cares deps 2017-05-02 11:24:03 -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
Muxi Yan e123a05913 Merge remote-tracking branch 'upstream/master' into backward-compat 2017-04-30 21:16:07 -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
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
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 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 3df4584b9c Merge github.com:grpc/grpc into epex4 2017-04-20 19:24:41 +00:00
murgatroid99 ce67bff2df Merge remote-tracking branch 'upstream/v1.3.x' into upmerge_v1.3.x 2017-04-19 15:54:27 -07:00
Craig Tiller 26ec8fba7a Merge github.com:grpc/grpc into epex4 2017-04-17 08:38:33 -07:00