Commit History

Author SHA1 Message Date
  Muxi Yan 31c66c576a Merge pull request #12399 from muxi/fix-stream-compression-transport-duplicate 8 years ago
  Vijay Pai efce6e1e50 Revert "Revert "Allow SerializationTraits to use grpc::ByteBuffer rather than only grpc_byte_buffer"" 8 years ago
  Muxi Yan 3f583b7829 Merge remote-tracking branch 'upstream/master' into fix-stream-compression-transport-duplicate 8 years ago
  David Garcia Quintas b352be025f Upmerge from v1.6.x branch to master 8 years ago
  Jan Tattermusch 5432dd8874 Revert "Allow SerializationTraits to use grpc::ByteBuffer rather than only grpc_byte_buffer" 8 years ago
  Vijay Pai 4a4bd1cd2d Merge pull request #12214 from vjpai/cereal_eye_sir 8 years ago
  Jan Tattermusch 4fa3364975 bump version to 1.6.1 8 years ago
  Muxi Yan adf6c8145e Merge remote-tracking branch 'upstream/master' into fix-stream-compression-transport-duplicate 8 years ago
  David Garcia Quintas 1faa48ead3 Merge branch 'master' of github.com:grpc/grpc into rename_lr_to_plugin 8 years ago
  Vijay Pai 677395558d Allow SerializationTraits to use grpc::ByteBuffer, not just grpc_byte_buffer 8 years ago
  Mark D. Roth 8941f607d6 Merge pull request #12369 from markdroth/call_combiner 8 years ago
  Craig Tiller 24f30f7ac0 Garbage collect experimental pollers 8 years ago
  David Garcia Quintas 0822d331df s/load_reporting/server_load_reporting 8 years ago
  Muxi Yan bf5484e785 build_project 8 years ago
  Mark D. Roth 764cf04a13 Revert "Revert "Implement call combiner"" 8 years ago
  Craig Tiller ccad38227f Merge github.com:grpc/grpc into stats 8 years ago
  Craig Tiller 6e739745e2 Fix header location error 8 years ago
  Mark D. Roth bf19961d0a Revert "Implement call combiner" 8 years ago
  Craig Tiller 03c908fc9e Merge github.com:grpc/grpc into stats 8 years ago
  David Garcia Quintas dfde288148 1.6.0-pre1 -> 1.6.0 8 years ago
  apolcyn 6b3003fa5a Merge pull request #12274 from apolcyn/fix_missing_nanopb_headers_master 8 years ago
  Mark D. Roth ff4f2db4b9 Merge pull request #11566 from markdroth/call_combiner 8 years ago
  Mark D. Roth 76e264b8df Implement call combiner. 8 years ago
  David Garcia Quintas 3499960070 Renamed load_reporting.{c,h} to load_reporting_plugin.{c,h} 8 years ago
  Stanley Cheung abbeefa8a4 PHP: backport master features into v1.6.x branch 8 years ago
  yang-g 9ff6031014 Add sync_custom.h 8 years ago
  yang-g 98ad80a815 Remove stale file 8 years ago
  Alexander Polcyn 02d1ff5eb2 fix build.yaml to expand nanopb headers filegroup 8 years ago
  Alexander Polcyn 66999d2192 fix build.yaml to expand nanopb headers file group 8 years ago
  Stanley Cheung 5d55948c34 PHP: upmerge from 1.4.x branch 8 years ago