Commit Graph

14368 Commits

Author SHA1 Message Date
Stanley Cheung 27b9e1cf3a Merge pull request #11174 from stanley-cheung/php-fix-c-ext-version
PHP: fix pecl extension version
2017-05-17 21:44:12 -07:00
Muxi Yan eb9b82b7e1 Merge pull request #11118 from muxi/backward-compat-dev
Add Backward compatibility API to C++
2017-05-17 16:08:24 -07:00
David G. Quintas 4de910df8b Merge pull request #11098 from dgquintas/fix_subchannel_stuffs
Fixes to subchannel and its index
2017-05-17 15:16:06 -07:00
Craig Tiller 1cb396dc18 Merge pull request #11192 from ctiller/compare-a-lago
Fix hpack_size test
2017-05-17 14:12:17 -07:00
Stanley Cheung d15f5c015a PHP: fix pecl extension reported version 2017-05-17 13:21:05 -07:00
Stanley Cheung 53c2bbdeb7 Merge pull request #11173 from stanley-cheung/php-split-protobuf-dep
PHP: stop requiring google/protobuf PHP implementation
2017-05-17 13:02:10 -07:00
Craig Tiller 2d1e8cda05 Fix hpack_size test 2017-05-17 12:41:44 -07:00
Muxi Yan f6b622c08a Take grpc_workaround_list as parameter 2017-05-17 10:34:10 -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
Stanley Cheung 6e589c6a15 PHP: stop requiring google/protobuf PHP implementation 2017-05-16 18:09:36 -07:00
Craig Tiller bcb65f0bd5 Merge pull request #10897 from ctiller/serve_fries
Switch default CQ count for thread manager to num_cpus
2017-05-16 13:41:04 -07:00
Muxi Yan bc60bb25b2 Merge remote-tracking branch 'upstream/master' into backward-compat-dev 2017-05-16 10:18:38 -07:00
Muxi Yan 928681dc3d obsolete -> is obsolete 2017-05-16 10:16:23 -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
lyuxuan d0b47db0c0 Merge pull request #11000 from lyuxuan/poll_stat
Get metric "polls/request" for benchmarks
2017-05-16 09:23:58 -07:00
Jan Tattermusch de030a35a2 regenerate projects 2017-05-16 18:20:26 +02:00
Jan Tattermusch 9eef67d0e0 fix python artifact build 2017-05-16 18:17:54 +02:00
kpayson64 3634fbe874 Merge pull request #10800 from kpayson64/fix_alpine
Fix alpine build
2017-05-16 08:44:27 -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
Yuxuan Li 8698f2bbee fix extern c location 2017-05-15 16:53:01 -07:00
Yang Gao 6756d75ca7 Merge pull request #11080 from per-gron/flatbuffer-compatibility
Fix Flatbuffer compatibility issues
2017-05-15 16:50:40 -07:00
Yuxuan Li a6429df861 fix last merge 2017-05-15 14:22:01 -07:00
Yuxuan Li 37c2e6d79f fix merge 2017-05-15 14:20:32 -07:00
Yuxuan Li 6ca796d7ad merge master, resolve conflict 2017-05-15 14:15:34 -07:00
Muxi Yan 29ff4665a8 Revert "Revert "Implement Server Backward Compatibility"" 2017-05-15 10:27:55 -07:00
Sree Kuchibhotla a6171a990e Merge pull request #10662 from sreecha/cq_mpsc_based
grpc_mpsc queue based completion queue
2017-05-15 10:06:07 -07:00
Jan Tattermusch 3e95a38bdf Merge pull request #11115 from jtattermusch/revamp_artifacts
Revamp artifacts, packages and distribtests
2017-05-15 11:59:13 +02:00
Per Grön 21458979f7 Fix clang-format issue 2017-05-14 11:25:43 +02:00
David G. Quintas 44369698fd Merge pull request #11076 from dgquintas/epoll_error_static_string
Don't crate GRPC_OS_ERROR with a non-static string
2017-05-12 19:12:34 -07:00
Nicolas "Pixel" Noble 2285f8bfde Merge branch 'master' of https://github.com/grpc/grpc into import 2017-05-13 00:37:51 +02:00
Nicolas Noble 7edcce2147 Revert "Implement Server Backward Compatibility" 2017-05-12 15:35:20 -07:00
Nicolas "Pixel" Noble 3445079089 Merge branch 'master' of https://github.com/grpc/grpc into import 2017-05-12 23:58:25 +02:00
Muxi Yan 04f97ca022 Merge branch 'master' into backward-compat-dev 2017-05-12 12:25:43 -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 3cf000fb2f Merge github.com:grpc/grpc into serve_fries 2017-05-12 11:26:19 -07:00
Nicolas "Pixel" Noble 232e9b458b Merge branch 'master' of https://github.com/grpc/grpc into import 2017-05-12 20:15:06 +02: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
Yang Gao 5854ac4af2 Merge pull request #11104 from yang-g/generic_deadline_propagation
Propagate deadline to GenericServerContext
2017-05-12 10:56:36 -07:00
Nicolas "Pixel" Noble 2ef7abc3c9 Merge branch 'master' of https://github.com/grpc/grpc into import 2017-05-12 16:55:31 +02:00
Jan Tattermusch d71a631956 regenerate 2017-05-12 15:54:42 +02:00
Jan Tattermusch 3294474d15 adjust package build scripts to new paths 2017-05-12 15:54:41 +02:00
Jan Tattermusch d18db4c7f8 upgrade C# to protobuf 3.3.0 2017-05-12 09:58:49 +02:00
yang-g a044f6d3f5 Propagate deadline to GenericServerContext 2017-05-11 15:37:51 -07:00
Michael Lumish 4b56aa52fc Merge pull request #11075 from murgatroid99/node_expose_constants
Move gRPC constants to js file to include them in generated documentation
2017-05-11 15:26:49 -07:00
David Garcia Quintas 6d8ca69ed3 Fixes to subchannel and its index 2017-05-11 14:29:34 -07:00
Nicolas "Pixel" Noble eb36b8ac77 Merge branch 'master' of https://github.com/grpc/grpc into import 2017-05-11 23:24:37 +02:00
Sree Kuchibhotla 8ac5c6deda Merge with master and fix a bad-merge 2017-05-11 14:13:11 -07:00
Sree Kuchibhotla 0fb74c2bb7 clang 2017-05-11 13:37:06 -07:00
Sree Kuchibhotla 467ad2002f Merge branch 'master' into cq_mpsc_based 2017-05-11 13:15:07 -07:00
Craig Tiller 54773cfed8 Merge github.com:grpc/grpc into serve_fries 2017-05-11 12:27:45 -07:00