Commit Graph

2291 Commits

Author SHA1 Message Date
apolcyn 5d0b1aeade Merge pull request #10992 from apolcyn/doxygen_cpp_nits
Doxygen cpp nits
2017-05-17 22:45:27 -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
Muxi Yan f6b622c08a Take grpc_workaround_list as parameter 2017-05-17 10:34:10 -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 b1e5bac392 Add /doc/workarounds.md 2017-05-16 11:07:55 -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 29ff4665a8 Revert "Revert "Implement Server Backward Compatibility"" 2017-05-15 10:27:55 -07:00
Alexander Polcyn 16153d11f8 address comments, description changes 2017-05-15 09:48:49 -07: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
Alexander Polcyn bb2c338924 format changes, address comments 2017-05-11 15:15:29 -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
Craig Tiller 63cde40c6d Merge pull request #11010 from ctiller/uberpoll
Roll up of all new polling engines
2017-05-11 10:55:02 -07:00
Sree Kuchibhotla 6e510f700d Merge branch 'master' into cq_mpsc_based 2017-05-10 19:35:03 -07:00
Alexander Polcyn d6ba5ecc34 fix bad line breaks and lengths 2017-05-10 16:21:56 -07:00
Alexander Polcyn 41ff2e1ee6 address comments, format changes 2017-05-10 15:39:58 -07:00
Muxi Yan 21be59b8dd sanity fix 2017-05-10 09:17:00 -07:00
ncteisen 22dbd73b43 Add static assert to enforce subtype invariant 2017-05-10 09:16:22 -07:00
Muxi Yan 034deab6d1 clang-format 2017-05-09 18:15:49 -07:00
Muxi Yan 36398e7978 Fix argument string 2017-05-09 18:12:22 -07:00
Muxi Yan f5b3db9c22 Use AddChannelArgument method 2017-05-09 17:12:24 -07:00
Muxi Yan b1a80c751d bug fixes 2017-05-09 16:50:54 -07:00
Muxi Yan cdc0d03b2d Add EnableWorkaround API to enable server workarounds 2017-05-09 16:26:51 -07:00
Muxi Yan e74b9aeaa2 Add comment 2017-05-09 14:55:53 -07:00
Muxi Yan 937dba3ea1 Put workaround list somewhere accessable by wrapping languages 2017-05-09 14:45:44 -07:00
Alexander Polcyn 0f02908e67 address comments 2017-05-09 14:28:58 -07:00
Alexander Polcyn a9f1e2566d address comments 2017-05-05 13:52:42 -07:00
Muxi Yan 3db618efe1 Merge remote-tracking branch 'upstream/master' into backward-compat 2017-05-05 13:32:43 -07:00
Sree Kuchibhotla 76edc30af1 Merge branch 'master' into cq_limited_pollers 2017-05-05 12:46:14 -07:00
Alexander Polcyn d809a15ec4 cpp doc nits 2017-05-05 11:02:07 -07:00
ncteisen fde16afefa Merge branch 'master' of https://github.com/grpc/grpc into serialization-refactor 2017-05-05 10:27:17 -07:00
David G. Quintas c2ad372d43 Merge pull request #10912 from dgquintas/trying-to-fix-stuff
Upmerge from 1.3.0 to master
2017-05-04 10:44:03 -07:00
Mark D. Roth 64d922ae87 Make sure we set deadline for the LB call even without a pick.
As part of this, get the deadline from a channel arg instead of pick_args.
2017-05-03 12:52:04 -07:00
Sree Kuchibhotla 4afb4db498 Merge branch 'master' into cq_mpsc_based 2017-05-03 09:36:02 -07:00
Vijay Pai 611e7e78de Reintroduce a lambda capture as part of C++11-izing code 2017-05-01 15:09:30 -07:00
Craig Tiller b79e809918 Merge github.com:grpc/grpc into serve_fries 2017-05-01 14:36:52 -07:00
Muxi Yan e123a05913 Merge remote-tracking branch 'upstream/master' into backward-compat 2017-04-30 21:16:07 -07:00
David Garcia Quintas 81aae44858 Merge branch 'v1.3.x' into master-upmerge-v1.3.x 2017-04-28 14:37:17 -07:00
David G. Quintas 7c6b4beb88 Merge pull request #10911 from dgquintas/remove_thrift
Removed 3rd party dep on thrift
2017-04-28 13:51:07 -07:00
Sree Kuchibhotla d65172ca4b Merge branch 'master' into cq_limited_pollers 2017-04-28 13:38:50 -07:00
David Garcia Quintas 97106a7ef2 Removed 3rd party dep on thrift 2017-04-28 13:11:11 -07:00
Muxi Yan d64e70a815 Use channel arg to enable workaround 2017-04-28 11:39:46 -07:00
Craig Tiller b86da9503a Ensure at least one cq 2017-04-27 16:28:09 -07:00
Craig Tiller 6c1c8e5f04 Increase default CQ count from 1 to num_cpus 2017-04-27 15:30:22 -07:00
Craig Tiller 4865c79548 Merge pull request #10613 from ctiller/framing_costs
Optimize framing a little
2017-04-27 14:53:12 -07:00
Craig Tiller 15fda75e1c Merge pull request #10427 from ctiller/c++lame
Convert Lame Client Channel code to C++
2017-04-27 09:03:19 -07:00
Sree Kuchibhotla 7f59e9d3ac Merge branch 'master' into cq_limited_pollers 2017-04-26 18:53:20 -07:00
Sree Kuchibhotla abc24c5317 Merge branch 'master' into cq_mpsc_based 2017-04-26 18:51:42 -07:00
Craig Tiller 737da9fdea Merge github.com:grpc/grpc into c++lame 2017-04-26 15:07:09 -07:00