Commit Graph

344 Commits

Author SHA1 Message Date
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
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 2a2599b5ca incremental fix - removed cronet dependency from grpc_secure 2016-06-01 15:19:06 -07:00
Makarand Dharmapurikar 38d8055306 cronet build related changes 2016-06-01 15:02:04 -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
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 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 d013e9b985 Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation 2016-05-18 11:00:31 -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
Makarand Dharmapurikar d46efd7812 replaced header list with filegroup in build.yaml. 2016-05-11 16:56:39 -07:00
makdharma c2ec95bad4 Revert "Revert "cronet wrapper code"" 2016-05-11 16:26:15 -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
Nicolas Noble b98e24b32b Merge pull request #6480 from jcanizales/update-version-master
Update podspec versions in master branch
2016-05-09 23:13:44 -07:00
Craig Tiller 42342cbebb Revert "cronet wrapper code" 2016-05-09 08:12:35 -07:00
Jorge Canizales f4639d4858 Move podspec to version 0.14 2016-05-06 16:41:36 -07:00
Jorge Canizales 4c20566834 Depend on latest BoringSSL 2016-05-06 16:40:25 -07:00
Jorge Canizales f58b4f41ff Have Cocoapods read from submodules too, for nanopb 2016-05-06 16:40:21 -07:00
Jorge Canizales 111c95df79 Move podspec to version 0.13 2016-05-06 16:40:14 -07:00
Nicolas Noble 48d833a9d8 Merge pull request #6214 from makdharma/master
cronet wrapper code
2016-05-05 14:09:17 -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
Makarand Dharmapurikar d5d8f8fbf9 Added all transitive header dependencies in build.yaml to fix the failing check. 2016-05-04 13:22:26 -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
David Garcia Quintas 80721b20ca Merge branch 'master' of github.com:grpc/grpc into codegen_remove_proto 2016-05-02 10:56:54 -07:00
David Garcia Quintas 580987abf0 Merge branch 'master' of github.com:grpc/grpc into lr_hook 2016-04-29 17:26:33 -07:00
David Garcia Quintas b41363e88e all good! missing end2end test for new lr filter 2016-04-29 00:41:21 -07:00
David Garcia Quintas 12e111c692 Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation 2016-04-27 19:15:12 -07:00
David Garcia Quintas d312a0b866 Smarter pollset/pollset_set propagation
For some definition of "smart"... client_channel simply passes along
pollset/pollset_set, removing the need to instantiate a pollset_set in
the subchannel_call_holder: it's now up to the LB policies to handle the
pollset/pollset_set.
2016-04-27 18:40:50 -07:00
Jan Tattermusch 165c62ff75 Merge pull request #6183 from nicolasnoble/msys-support
Adding support for msys.
2016-04-27 16:31:59 -07:00
David Garcia Quintas 1b2db6333d Moved protos out of core_codegen interface 2016-04-27 15:09:11 -07:00
David Garcia Quintas 396f4450fd Merge branch 'master' of github.com:grpc/grpc into lr_hook 2016-04-27 14:23:24 -07:00
Yuchen Zeng 12dfdc3c27 Change win32 file suffix 2016-04-26 22:05:41 -07:00
David Garcia Quintas 7f0793ad62 Updated load balancer proto to v1 2016-04-25 16:48:26 -07:00
Craig Tiller 7beea147e5 Merge github.com:grpc/grpc into strong-includes 2016-04-21 17:07:36 -07:00
Deepak Lukose dba4c5fd01 Add various options to verify ssl/tls client cert including letting the
application handle the authentication.
2016-04-19 15:02:06 -07:00
Nicolas "Pixel" Noble c4b18a50de Adding support for msys. 2016-04-15 07:39:26 +02:00
Craig Tiller 3ab2fe0094 Rollup of changes from the latest import 2016-04-11 20:11:18 -07:00
David Garcia Quintas 9885bff5fb Factored out parse functions from sockaddr_resolver 2016-04-08 17:08:57 -07:00