Commit Graph

555 Commits

Author SHA1 Message Date
ncteisen bdb746ec00 Merge branch 'master' of https://github.com/grpc/grpc into channel-tracing 2018-01-29 10:58:59 -08:00
Mark D. Roth 77474d46ad
Merge pull request #13820 from yihuazhang/rename-gts
Rename GTS to ALTS for TSI plugin
2018-01-26 08:30:44 -08:00
Muxi Yan fd900e09fb Merge remote-tracking branch 'upstream/master' into fix-stream-compression-config-interface 2018-01-24 16:16:23 -08:00
ncteisen 4e8bcb2cee Fix header dependancy 2018-01-23 10:44:15 -08:00
Yihua Zhang d36fe0708b rename gts to alts 2018-01-23 10:40:45 -08:00
ncteisen 34ebf5dd9e Move object registry out of gpr 2018-01-23 09:10:14 -08:00
ncteisen bd0c019c39 Merge branch 'master' of https://github.com/grpc/grpc into channel-tracing 2018-01-23 08:58:11 -08:00
Mehrdad Afshari fb309a966b
Merge pull request #14092 from mehrdada/bump1-10
Bump version to 1.10
2018-01-19 15:11:31 -08:00
Mehrdad Afshari 43884047c9 Regenerate projects 2018-01-19 14:25:15 -08:00
Mark D. Roth 4f2b0fdadf Rename 'gpr++' directories to 'gprpp'. 2018-01-19 13:04:59 -08:00
Muxi Yan fb061c329a Merge remote-tracking branch 'upstream/master' into fix-stream-compression-config-interface 2018-01-19 12:20:15 -08:00
Mark D. Roth dbdf495f61 Split lib/support into lib/gpr and lib/gpr++. 2018-01-18 11:21:12 -08:00
Muxi Yan 47fe8507a1
Merge pull request #14031 from muxi/fix-boringssl-sed
Fix sed error in podspecs on sed 4.4
2018-01-17 14:18:17 -08:00
Muxi Yan f3c83bfe3d Fix sed error in podspecs on sed 4.4 2018-01-16 12:05:17 -08:00
Ken Payson b353297b43 Revert "Revert "Set error status correctly on server side""
This reverts commit 951f84aea0.
2018-01-11 20:25:30 -08:00
David G. Quintas 951f84aea0
Revert "Set error status correctly on server side" 2018-01-11 15:32:34 -08:00
Mark D. Roth 324703db51 Fix existing ref counting classes and add new ones. 2018-01-11 07:41:31 -08:00
Mark D. Roth 53430532ce
Merge pull request #13676 from markdroth/inlined_vector
Implement InlinedVector independently of absl.
2018-01-11 07:01:02 -08:00
Vijay Pai 1d91362f81 exec_ctx_fwd.h should never have been in public headers 2018-01-10 15:59:05 -08:00
Mark D. Roth c6406f32f6 Implement InlinedVector independently of absl. 2018-01-10 14:47:37 -08:00
ncteisen b04efac6a5 Merge branch 'master' of https://github.com/grpc/grpc into channel-tracing 2018-01-09 13:49:37 -08:00
Ken Payson 6535cfd140 Set error status correctly on server side 2018-01-04 13:17:28 -08:00
ncteisen 7d9b6358b5 Initial commit
Picks up work from https://github.com/grpc/grpc/pull/10259.
A merge was impossible due to the many sweeping changed that
have occured since I last touched that PR (c++-ization, exec_ctx,
reorganitation of filters, etc).
2017-12-28 15:09:17 -08:00
Muxi Yan b0f821cef9 Generate more files in gRPC-Core.podspec from build.yaml 2017-12-19 15:40:25 -08:00
Muxi Yan 6043006af1 Merge remote-tracking branch 'upstream/master' into fix-stream-compression-config-interface 2017-12-06 22:29:12 -08:00
Muxi Yan fc38142db6 Merge commit 'b0bad8f^' into fix-stream-compression-config-interface 2017-12-06 22:02:08 -08:00
Muxi Yan 4a117f0be7 Merge e759d2a^ 2017-12-06 18:47:16 -08:00
Muxi Yan 08aa228771
Merge pull request #13196 from muxi/upgrade-cocoapods-min-version
Require min Cocoapods version to be v1.2.0
2017-12-05 16:16:39 -08:00
Vijay Pai 195cf1ebfd Move histogram to test/core/util 2017-11-30 15:02:04 -08:00
Mark D. Roth 5f662537de
Merge pull request #13357 from markdroth/reference_counted
Add ReferenceCounted base class.
2017-11-30 07:05:18 -08:00
Mark D. Roth b337de9e02 Merge remote-tracking branch 'upstream/master' into reference_counted 2017-11-29 11:27:40 -08:00
Mark D. Roth bf816d325e Shorted "reference" to "ref". 2017-11-29 11:25:34 -08:00
Mark D. Roth 240bad3d2d Fix check_sources_and_headers. 2017-11-29 10:50:45 -08:00
Nicolas "Pixel" Noble 361f8108e4 Merge branch 'master' of https://github.com/grpc/grpc into upmerge-from-v1.7 2017-11-29 19:31:42 +01:00
Mark D. Roth b319f491ff Code review changes. 2017-11-28 14:50:07 -08:00
Craig Tiller ecd1d5449d Merge github.com:grpc/grpc into no-absl 2017-11-28 13:58:04 -08:00
Mehrdad Afshari d39d007e8f
Merge pull request #13515 from mehrdada/bump-master-version
Bump 1.8.0-dev to 1.9.0-dev
2017-11-28 13:30:54 -08:00
Craig Tiller 84e379ae85 Merge github.com:grpc/grpc into no-absl 2017-11-28 11:38:55 -08:00
Mark D. Roth cf9ca843eb Add ReferenceCountedPtr class. 2017-11-28 08:24:35 -08:00
Mehrdad Afshari 14e96f9ae8 Bump 1.8.0-dev to 1.9.0-dev 2017-11-27 17:14:15 -08:00
Mark D. Roth 70db663ae8 Add ReferenceCounted base class. 2017-11-27 14:53:26 -08:00
Vijay Pai 891254292e Remove lockfree stack, again 2017-11-22 10:22:28 -08:00
Noah Eisen b8ec238211 Merge branch 'master' of https://github.com/grpc/grpc into inheritance-in-core 2017-11-21 10:12:28 -08:00
Nicolas "Pixel" Noble 18a6837bb0 Merge branch 'v1.7.x' of https://github.com/grpc/grpc 2017-11-21 00:36:21 +01:00
Craig Tiller 348b334f4b Back-out absl dependency for now 2017-11-13 15:16:03 -08:00
ncteisen 0b37f03991 Regenerate projects 2017-11-13 10:03:01 -08:00
ncteisen dd34f3caf6 Inline closure 2017-11-12 20:18:24 -08:00
Alexander Polcyn 9f5163eb85 Bump v1.7.x branch to 1.7.2 2017-11-01 11:07:28 -07:00
Yash Tibrewal 888691344e Merge branch 'master' into testc++ize 2017-10-31 11:24:36 -07:00
Jim King 3e0769957e
Merge pull request #13106 from Vizerai/census_update
Cleaning up census code.
2017-10-31 11:10:00 -07:00