Commit Graph

145 Commits

Author SHA1 Message Date
yang-g 71b962634e merge with head 2015-11-18 11:41:30 -08:00
yang-g a6124120ae first part, secure channel only 2015-11-05 22:36:20 -08:00
Craig Tiller ca1593a955 stream_op cleanup: build system changes 2015-11-02 14:08:33 -08:00
Jorge Canizales 10622a8d9b Prevent XCode 7 from showing spurious warnings
This will hopefully make xctool work on Travis too (cross fingers!)
2015-10-28 07:10:47 -07:00
David Garcia Quintas b5ab8a29f5 Merge branch 'master' of github.com:grpc/grpc into microchannels 2015-10-19 15:41:42 -07:00
Craig Tiller e2a1bf46f9 Merge pull request #3726 from dgquintas/iomgr_executor
Introducing grpc_executor, for all your threading needs
2015-10-19 15:18:24 -07:00
Jorge Canizales 951875ffe0 Refer to https://github.com/CocoaPods/CocoaPods/issues/4386 regarding hack. 2015-10-15 18:30:07 -07:00
Jorge Canizales 0c8a3d804e Undo moving include/ one dir up, to ease testing workflow. 2015-10-15 18:26:18 -07:00
Jorge Canizales aff5664a86 Undo Cocoapods’ bug workaround 2015-10-15 18:02:48 -07:00
David Garcia Quintas b65e4213a3 fixed faulty merge 2015-10-14 12:00:21 -07:00
David Garcia Quintas 0fe72429a0 Merge branch 'master' of github.com:grpc/grpc into microchannels 2015-10-13 16:17:26 -07:00
David Garcia Quintas e945cd8064 Merge branch 'master' of github.com:grpc/grpc into iomgr_executor 2015-10-12 21:18:42 -07:00
Craig Tiller 2b15f1e25a Merge github.com:grpc/grpc into latent-see 2015-10-09 17:07:56 -07:00
Craig Tiller 0ba432d445 Move profiling system to gpr 2015-10-09 16:57:11 -07:00
David Garcia Quintas 0c331880d0 Hid test-only functions from surface/call.h 2015-10-08 14:57:11 -07:00
Craig Tiller 504ed5997a Get basic profiler working again 2015-10-08 07:38:43 -07:00
David Garcia Quintas 4bc3463108 Introducing grpc_executor, for all your threading needs 2015-10-07 16:12:35 -07:00
David Garcia Quintas 7b1bd2c271 μChannels implementation. 2015-10-05 18:22:10 -07:00
Craig Tiller 2a548d082b Merge pull request #3006 from soltanmm/sketchbook
Add API tracing, coalesce surface+batch tracing
2015-10-05 08:48:57 -07:00
Nicolas "Pixel" Noble cff6469dfc Making template agree with clang-format. 2015-10-03 02:01:51 +02:00
Masood Malekghassemi 9229810752 Update build files 2015-10-02 16:37:33 -07:00
Masood Malekghassemi fe1093c3a8 Update build tools 2015-10-02 16:37:33 -07:00
Tim Emiola 25061413cf Merge pull request #3602 from grpc/release-0_11
Upmerge from beta to master.
2015-10-02 13:43:14 -07:00
Jorge Canizales c825f42347 Update versions in Podspec to 0.11.1 2015-09-28 22:16:34 -07:00
Yang Gao b09a875917 Merge pull request #3476 from vjpai/block_annotate
Annotate blocking points
2015-09-25 13:54:51 -07:00
vjpai 9839d285cd Move block_annotate from iomgr to support since it's used in other
core places besides iomgr
2015-09-24 17:55:18 -07:00
Vijay Pai 3dd3ba1efa Rebuild all project files with new header included 2015-09-24 15:04:07 -07:00
Craig Tiller 8af4c33718 Final patches for rename 2015-09-22 12:32:31 -07:00
Craig Tiller 298751c119 Split closures from iomgr.h 2015-09-22 09:41:05 -07:00
Craig Tiller 10ee2747a9 Merge github.com:grpc/grpc into we-are-one 2015-09-22 09:25:57 -07:00
Craig Tiller 786522166e Merge pull request #3027 from jboeuf/security_connector_refactoring
Security connector refactoring
2015-09-22 08:25:57 -07:00
Craig Tiller ba496454b2 Fixes 2015-09-21 17:15:19 -07:00
David Garcia Quintas 2921cf0b34 regenerated projects 2015-09-16 18:02:50 -07:00
Julien Boeuf 5600a6aaac Changing build.yaml: s/secure_tranport_setup/handshake 2015-09-15 23:01:39 -07:00
Julien Boeuf e9961d29f1 Merge branch 'master' of github.com:grpc/grpc into security_connector_refactoring 2015-09-15 22:51:02 -07:00
Craig Tiller 1701b09333 Merge github.com:grpc/grpc into shindig 2015-09-11 13:33:26 -07:00
Craig Tiller 73b6606629 Workqueue: interface, test, and posix implementation 2015-09-09 09:34:46 -07:00
Jorge Canizales 7f51a041b4 Restrict deployment targets to the protobuf requirement. 2015-09-08 21:31:59 -07:00
Jorge Canizales 0bee681ab1 Bump version of gRPC.podspec to 0.11
Technically unnecessary, but for consistency with the other beta releases.
2015-09-08 21:05:33 -07:00
David Garcia Quintas 4fb049b647 Added round robin LB policy. 2015-09-08 10:47:37 -07:00
David Garcia Quintas 5c4543d9f5 Introduced a registry for LB policies. 2015-09-03 16:04:19 -07:00
Alistair Veitch 1c09accaad change aggregation_ops to internal type 2015-08-31 16:57:32 -07:00
Alistair Veitch c47621fbef merge 2015-08-31 08:39:47 -07:00
Alistair Veitch bff9cf52ed Merge branch 'master' into tracing_api 2015-08-28 14:35:49 -07:00
Alistair Veitch ae7bbfcb92 merge to head 2015-08-28 11:00:02 -07:00
Alistair Veitch 9a09982e2d view and aggregation API 2015-08-27 13:16:00 -07:00
Hongyu Chen beb580b941 More merge conflict fix 2015-08-25 16:19:33 -07:00
Alistair Veitch a4e884721d merge to head 2015-08-25 15:36:20 -07:00
Hongyu Chen 011ea49592 Merge remote-tracking branch 'upstream/master' into timespec 2015-08-25 14:44:15 -07:00
yang-g 31ff8bcc15 add missing headers from 2495 2015-08-25 14:09:06 -07:00