murgatroid99
|
eebb129fd3
|
Merge branch 'master' into uv_core_transport
|
2016-10-03 09:33:29 -07:00 |
murgatroid99
|
c36f6ea745
|
Compile and link core tests with libuv
|
2016-10-03 09:24:09 -07:00 |
Nicolas "Pixel" Noble
|
748524eea5
|
Merge branch 'master' of https://github.com/grpc/grpc into master-upmerge-from-deep-under
|
2016-09-29 19:28:28 +02:00 |
Nicolas "Pixel" Noble
|
87a1081211
|
Merge remote-tracking branch 'google/v1.0.x' into master-upmerge-from-deep-under
|
2016-09-29 01:31:54 +02:00 |
murgatroid99
|
08b0fab426
|
Merge branch 'master' into uv_core_transport
|
2016-09-23 14:35:49 -07:00 |
Mark D. Roth
|
1a2e6ac10d
|
Merge remote-tracking branch 'upstream/master' into deadline_filter
|
2016-09-23 09:47:01 -07:00 |
Mark D. Roth
|
942c264861
|
Merge pull request #7611 from markdroth/http_connect
HTTP CONNECT handshaker
|
2016-09-23 09:44:30 -07:00 |
Mark D. Roth
|
54dfd68a0e
|
Ran generate_projects.sh.
|
2016-09-22 09:42:59 -07:00 |
Yuchen Zeng
|
24129f010c
|
Merge remote-tracking branch 'upstream/master' into cli_list
|
2016-09-21 14:10:47 -07:00 |
Mark D. Roth
|
933c955aaf
|
Merge remote-tracking branch 'upstream/master' into http_connect
|
2016-09-21 08:12:11 -07:00 |
Mark D. Roth
|
3c09810ac9
|
Merge remote-tracking branch 'upstream/master' into deadline_filter
|
2016-09-21 08:01:05 -07:00 |
Nicolas "Pixel" Noble
|
880b4578ab
|
Backport of #8055 into v1.0.x.
|
2016-09-20 20:24:44 +02:00 |
Jim King
|
9fec58f2b4
|
Merge pull request #8052 from Vizerai/grpc_tracing
grpc tracing context
|
2016-09-19 11:35:59 -07:00 |
Mark D. Roth
|
9710e2cb71
|
Merge remote-tracking branch 'upstream/master' into deadline_filter
|
2016-09-19 11:13:27 -07:00 |
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 |
Mark D. Roth
|
85102a9eb6
|
Merge remote-tracking branch 'upstream/master' into http_connect
|
2016-09-16 13:24:05 -07:00 |
Mark D. Roth
|
eaea5caab3
|
Merge remote-tracking branch 'upstream/master' into deadline_filter
|
2016-09-16 13:12:21 -07:00 |
Mark D. Roth
|
34dac9d4ca
|
Merge remote-tracking branch 'upstream/master' into max_send_size_filter
|
2016-09-16 13:06:26 -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 |
Mark D. Roth
|
8b7678cf84
|
Merge remote-tracking branch 'upstream/master' into http_connect
|
2016-09-16 10:51:15 -07:00 |
Mark D. Roth
|
abf03aed93
|
Merge remote-tracking branch 'upstream/master' into max_send_size_filter
|
2016-09-16 07:35:37 -07:00 |
Yang Gao
|
24869d558a
|
Merge pull request #7996 from yang-g/canonical
Add a helper to get canonical code from status
|
2016-09-15 15:58:17 -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 |
Mark D. Roth
|
3f6ab54f28
|
Merge remote-tracking branch 'upstream/master' into http_connect
|
2016-09-13 14:53:54 -07:00 |
Mark D. Roth
|
5e1b58bcea
|
Merge remote-tracking branch 'upstream/master' into deadline_filter
|
2016-09-12 16:59:00 -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 |
Mark D. Roth
|
242dc4be0e
|
Merge remote-tracking branch 'upstream/master' into deadline_filter
|
2016-09-12 11:54:25 -07:00 |
Yuchen Zeng
|
3951f2e05b
|
Merge remote-tracking branch 'upstream/master' into cli_list
|
2016-09-12 11:11:32 -07:00 |
Vizerai
|
12d1fc61d8
|
initial commit of tracing context files
|
2016-09-09 14:22:19 -07:00 |
yang-g
|
d558149a5e
|
Add a helper to get canonical code from status
|
2016-09-09 09:37:33 -07:00 |
Mark D. Roth
|
f451d50d4c
|
Merge remote-tracking branch 'upstream/master' into deadline_filter
|
2016-09-09 07:24:52 -07:00 |
Craig Tiller
|
8f416dbb97
|
Merge github.com:grpc/grpc into grand-unified-closures
|
2016-09-08 09:54:03 -07:00 |
Mark D. Roth
|
ebfcd97940
|
Merge remote-tracking branch 'upstream/master' into max_send_size_filter
|
2016-09-08 07:16:34 -07:00 |
Nicolas "Pixel" Noble
|
5928bff0c7
|
Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge
|
2016-09-08 01:58:49 +02:00 |
Craig Tiller
|
c1c691fdb1
|
Fix merge error
|
2016-09-07 10:40:13 -07:00 |
Mark D. Roth
|
c890042118
|
Merge remote-tracking branch 'upstream/master' into deadline_filter
|
2016-09-07 09:18:04 -07:00 |
Mark D. Roth
|
164f0e926d
|
Merge remote-tracking branch 'upstream/master' into http_connect
|
2016-09-07 09:14:50 -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 |
Nicolas Noble
|
6ce5228737
|
Merge pull request #7953 from makdharma/grpc_caching_test
Grpc caching test
|
2016-09-06 13:58:54 -07:00 |
Mark D. Roth
|
6c3295a5a2
|
Merge remote-tracking branch 'upstream/master' into http_connect
|
2016-09-06 11:04:11 -07:00 |
Mark D. Roth
|
7bfa1a8343
|
Merge remote-tracking branch 'upstream/master' into max_send_size_filter
|
2016-09-06 10:44:32 -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
|
fb475c93c4
|
Merge remote-tracking branch 'upstream/master' into deadline_filter
|
2016-09-01 14:22:55 -07: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 |
Craig Tiller
|
1141aef9b7
|
Merge pull request #7936 from y-zeng/log_test
Add no-logging test
|
2016-09-01 10:49:28 -07:00 |