Craig Tiller
13c0940f66
Merge branch 'idempotent_endpoint_shutdown' into handshake_timeout
2016-06-15 09:41:33 -07:00
Yuchen Zeng
d7a15b86b7
Merge remote-tracking branch 'upstream/master' into base64_decode
2016-06-09 11:02:10 -07:00
Craig Tiller
0ca68b7cb1
Merge github.com:grpc/grpc into error
2016-06-09 07:50:50 -07:00
Jan Tattermusch
1bc2976a0f
Merge pull request #6481 from dgquintas/compression_md_level_bis
...
Allow servers to select compression level via initial MD & overall compression cleanup
2016-06-08 19:17:20 -07:00
Yuchen Zeng
0a0c1b0d59
Merge remote-tracking branch 'upstream/master' into base64_decode
2016-06-08 17:52:05 -07:00
David Garcia Quintas
533add5a87
Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis
2016-06-07 21:21:27 -07:00
Adam Michalik
bf10c82bf8
implement support for adding external fd to server
2016-06-07 15:09:19 -07:00
Adam Michalik
321b1fb1c2
separate posix functionality to grpc_posix.h
2016-06-07 15:09:19 -07:00
Craig Tiller
c97065da86
Merge github.com:grpc/grpc into error
2016-06-07 13:00:14 -07:00
Craig Tiller
2888bd58b0
Merge github.com:grpc/grpc into error
2016-06-07 11:00:42 -07:00
David Garcia Quintas
a0d7491e62
Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation
2016-06-06 16:25:48 -07:00
Jan Tattermusch
87ec3b77b5
Merge pull request #6750 from makdharma/cronet
...
cronet build related changes to build.yaml, and added ifdef guard around objective_c cronet code.
2016-06-06 12:44:12 -07:00
Craig Tiller
d925c93047
Merge github.com:grpc/grpc into error
2016-06-06 08:38:50 -07:00
David Garcia Quintas
55c08f81cf
Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis
2016-06-03 14:18:01 -07:00
Jan Tattermusch
6c81c25653
Merge pull request #6306 from y-zeng/win32_suffix
...
Change win32 file suffix
2016-06-03 16:13:51 -04:00
David Garcia Quintas
e7518461c2
Merge branch 'master' of github.com:grpc/grpc into lr_hook
2016-06-02 10:24:51 -07:00
Makarand Dharmapurikar
38d8055306
cronet build related changes
2016-06-01 15:02:04 -07:00
Craig Tiller
4b5e757147
Merge github.com:grpc/grpc into error
2016-06-01 14:55:33 -07:00
Jan Tattermusch
6eb2380a8f
Merge pull request #6702 from a-veitch/add_proto
...
Add census protos.
2016-06-01 14:38:06 -04:00
Craig Tiller
4c751ebd50
Merge github.com:grpc/grpc into error
2016-06-01 09:34:42 -07:00
David Garcia Quintas
2a50dfefdc
s/grpc_pops/grpc_polling_entity
2016-05-31 15:10:58 -07:00
Yuchen Zeng
4594bd9d1b
Merge remote-tracking branch 'upstream/master' into base
2016-05-31 14:19:57 -07:00
David Garcia Quintas
8bec6f6a55
Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation
2016-05-31 13:59:37 -07:00
Craig Tiller
69f3e2bf2e
Revert "Remove legacy poller"
...
This reverts commit d88e15cee7 .
2016-05-31 13:45:24 -07:00
Alistair Veitch
d69354e488
Merge branch 'master' into add_proto
2016-05-24 09:03:47 -07:00
Craig Tiller
48abdde197
Merge github.com:grpc/grpc into error
2016-05-24 06:55:28 -07:00
Craig Tiller
c4c6ecf8e9
Merge github.com:grpc/grpc into test_affine
2016-05-23 12:48:55 -07:00
Alistair Veitch
30fe63243a
end-to-end compilation
2016-05-23 10:11:28 -07:00
Craig Tiller
d88e15cee7
Remove legacy poller
2016-05-20 12:22:37 -07:00
David Garcia Quintas
772f485334
Merge branch 'master' of github.com:grpc/grpc into lr_hook
2016-05-19 14:56:03 -07:00
Julien Boeuf
a4880374f9
Merge branch 'master' of github.com:grpc/grpc into credentials_refactoring
2016-05-18 22:12:43 -07:00
David Garcia Quintas
ac0944701a
Merge branch 'compression_incoming_checks' into compression_md_level_bis
2016-05-18 20:25:57 -07:00
Craig Tiller
8517886c6a
Move load_file into iomgr
2016-05-18 16:09:16 -07:00
David Garcia Quintas
d013e9b985
Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation
2016-05-18 11:00:31 -07:00
Craig Tiller
d6a5b803f4
Merge github.com:grpc/grpc into error
2016-05-13 20:17:38 -07:00
Jan Tattermusch
effd74c3cc
Merge pull request #5456 from ctiller/cleaner-posix3
...
Splitting out a pure poll() based event engine
2016-05-13 11:37:12 -07:00
Yuchen Zeng
d982bba41d
Add base64 decoder
2016-05-12 18:53:52 -07:00
David Garcia Quintas
6d0b4d20c0
Merge branch 'master' of github.com:grpc/grpc into merge
2016-05-12 14:28:36 -07:00
makdharma
c2ec95bad4
Revert "Revert "cronet wrapper code""
2016-05-11 16:26:15 -07:00
Craig Tiller
a58ed7cfab
Merge github.com:grpc/grpc into error
2016-05-11 10:55:18 -07:00
Craig Tiller
fe01b58223
Merge github.com:grpc/grpc into cleaner-posix3
2016-05-11 08:05:59 -07:00
Julien Boeuf
bae6a4cb43
Merge branch 'master' of https://github.com/grpc/grpc into credentials_refactoring
2016-05-10 15:26:17 -07:00
Jan Tattermusch
fffd296bc5
Merge pull request #6279 from dgquintas/lb_proto_v1
...
Updated load balancer proto to v1
2016-05-10 10:15:42 -07:00
Craig Tiller
42342cbebb
Revert "cronet wrapper code"
2016-05-09 08:12:35 -07:00
Craig Tiller
ddad978996
API fuzzer compiles with new error handling
2016-05-05 17:11:31 -07:00
Craig Tiller
4ba6a646cd
Merge branch 'credentials_refactoring' of github.com:jboeuf/grpc into error
2016-05-05 13:01:39 -07:00
Julien Boeuf
8ca294e417
Refactoring the core security code.
...
As opposed to a flat directory, we now have the following structure:
- security
-context
- credentials
- composite
- fake
- google_default
- iam
- jwt
- oauth2
- plugin
- ssl
- transport
- util
We have not refactored the test code yet but this PR is already large
enough...
2016-05-04 15:51:28 -07:00
David Garcia Quintas
f72eb97b36
Introduced grpc_pops (pollset or pollset_set)
2016-05-03 18:28:09 -07:00
Makarand Dharmapurikar
274bcc8f0b
Added dummy cronet api implementation so we can build on Jenkins.
2016-05-03 17:34:54 -07:00
Craig Tiller
7c6ba9bae4
Merge github.com:grpc/grpc into error
2016-05-03 12:56:40 -07:00