Commit Graph

63 Commits

Author SHA1 Message Date
murgatroid99 bcc60f75d4 Merge branch 'master' into uv_core_transport 2016-09-16 13:44:28 -07:00
murgatroid99 9030c81f20 Add a libuv endpoint to the C core, for use in the Node library 2016-09-16 13:25:08 -07:00
Craig Tiller ee43d7bbb1 Merge pull request #8069 from grpc/revert-8068-revert-7279-grand-unified-closures
Revert "Revert "Grand unified closures""
2016-09-16 12:11:11 -07:00
Craig Tiller a51f54192a Merge pull request #7559 from dgquintas/codegen_cleanse
Removed references to public APIs from codegen/
2016-09-13 19:40:43 -07:00
Craig Tiller 57726ca5a9 Revert "Revert "Grand unified closures"" 2016-09-12 11:59:45 -07:00
Craig Tiller 537f7c2a13 Revert "Grand unified closures" 2016-09-12 11:56:39 -07:00
Craig Tiller 344834b40b Merge github.com:grpc/grpc into grand-unified-closures 2016-09-07 08:39:05 -07:00
Craig Tiller e0321637d7 Merge pull request #7774 from ctiller/percent-encoder
Percent encoding routines
2016-09-06 22:08:12 -07:00
Craig Tiller 255dad3630 Merge github.com:grpc/grpc into grand-unified-closures 2016-09-02 09:15:23 -07:00
David Garcia Quintas e44902ecc9 Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse 2016-09-02 15:27:33 +02:00
Mark D. Roth 79620aaa10 Merge pull request #7943 from markdroth/client_channel_cleanup
Move subchannel_call_holder code into client_channel module.
2016-09-01 13:12:56 -07:00
David Garcia Quintas d3dee72437 Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse 2016-09-01 20:18:41 +02:00
Mark D. Roth 4c0fe49f76 Move subchannel_call_holder code into client_channel module. 2016-08-31 13:51:55 -07:00
Alistair Veitch a0c69f9099 add trace context proto 2016-08-31 12:01:27 -07:00
Craig Tiller dadda8bf52 Merge github.com:grpc/grpc into grand-unified-closures 2016-08-30 20:51:45 -07:00
David Garcia Quintas f3581bf90a Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse 2016-08-30 04:45:50 -07:00
Mark D. Roth 8e2c98adf0 Merge pull request #7839 from markdroth/rename_client_config
Rename grpc_client_config to grpc_resolver_result.
2016-08-29 13:27:23 -07:00
Mark D. Roth ff4df06a66 Rename grpc_client_config to grpc_resolver_result. 2016-08-22 15:02:49 -07:00
Nicolas "Pixel" Noble e3e17d3f6b Merge branch 'v1.0.x' of https://github.com/grpc/grpc 2016-08-20 01:45:32 +02:00
Jorge Canizales 4a18c67b77 Move Podspecs to v1 2016-08-18 13:26:25 -07:00
Craig Tiller 17ed6b17c7 Percent encoding routines 2016-08-18 09:33:33 -07:00
Nicolas "Pixel" Noble a469e5d42e grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. 2016-08-17 05:47:55 +02:00
murgatroid99 7c205906d5 Removed GPR_POSIX_FILE, and changed the files that used it 2016-08-09 10:07:42 -07:00
murgatroid99 5407089b37 Separate out iomgr-specific constants into a separate header 2016-08-08 17:01:18 -07:00
murgatroid99 79b322751f refactor inet_ntop into a portability header 2016-08-08 13:38:30 -07:00
Craig Tiller 106df11093 Merge github.com:grpc/grpc into grand-unified-closures 2016-08-04 09:22:34 -07:00
Muxi Yan d924b01482 Merge pull request #7554 from muxi/fix-cronet-interop-test
Fix Objective-C test pods for Cronet tests
2016-08-02 16:29:30 -07:00
kpayson64 5e1fbd2061 Merge pull request #7370 from rjshade/move_timeout_encoding
Move timeout_encoding to core/lib/transport
2016-08-02 16:20:01 -07:00
kpayson64 329d6473db Merge pull request #6774 from a-veitch/add_resource
Add Census resource API and implementation.
2016-08-02 12:46:43 -07:00
David Garcia Quintas 1f32ae4e84 Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse 2016-08-02 10:24:44 -07:00
David Garcia Quintas 8c5424f0d5 added gpr_types.h 2016-08-01 22:49:00 -07:00
David Garcia Quintas 87e06c84fd Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 2016-08-01 11:02:22 -07:00
Muxi Yan f8372c607a Minor revisions 2016-07-29 09:58:55 -07:00
David Garcia Quintas e8fd66b71d removed codegen/slice_buffer.h and scrubbed codegen/slice.h 2016-07-27 22:05:37 -07:00
David Garcia Quintas c79b0650d2 removed codegen/log.h 2016-07-27 21:11:58 -07:00
David Garcia Quintas 1399e466b0 removed codegen/time.h 2016-07-27 20:31:55 -07:00
David Garcia Quintas 3b31fdf77b removed codegen/byte_buffer.h 2016-07-27 18:17:12 -07:00
Muxi Yan 2a5072e80f Fix Objective-C test pods for Cronet tests 2016-07-27 15:10:22 -07:00
David Garcia Quintas 6b11462da1 removed codegen/alloc.h 2016-07-27 14:49:53 -07:00
Robbie Shade 43b633d54f Merge branch 'master' into move_timeout_encoding 2016-07-26 07:44:10 -04:00
Nicolas Noble 01da196879 Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master
V1.0.x merge into master
2016-07-25 14:45:41 -07:00
Craig Tiller 3e426718f0 Merge github.com:grpc/grpc into grand-unified-closures 2016-07-24 13:00:57 -07:00
murgatroid99 316f73f6c1 Merge v1.0.x into master 2016-07-22 11:00:34 -07:00
Alistair Veitch 3abd27e531 merge to upstream/master 2016-07-21 17:29:04 -07:00
Mark D. Roth 3b17e44eb3 Merge remote-tracking branch 'upstream/master' into handshake_api 2016-07-21 11:20:40 -07:00
Nicolas "Pixel" Noble 20b8333efa Sanitizing master. 2016-07-21 19:28:38 +02:00
Jorge Canizales f8c4580939 Commit as 1.0.0-pre1 so we can release already. 2016-07-18 17:51:31 -07:00
Jorge Canizales 854c167069 We’re done with the underscore tags for good!
Yay compatibility and predictability!
2016-07-18 12:30:01 -07:00
Muxi Yan e04089e7c0 Establish Objective C end-to-end core test with Cronet 2016-07-15 16:35:20 -07:00
Jorge Canizales 854b81a83b Advance versions from 0.14 -> 1.0
Pending:

- Tag BoringSSL repo.
- Tag gRPC repo.
- Build the plugin, zip it, and add it to the release.
- Push Cocoapods to trunk.
2016-07-15 11:23:48 -07:00